diff options
| author | Mark Aaron Shirley | 2012-12-19 14:37:44 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-12-19 14:37:44 -0800 |
| commit | ae6ca7456feda199124eb78f7872f969fa67d7b8 (patch) | |
| tree | 60ef0e77fa0fbe8af097b36e9f83a3474d17ae8e /rest_framework/tests/serializer.py | |
| parent | c6a6d7ac15b351e2d81685abefd44542367b6e6f (diff) | |
| parent | c29b08ad43c8de5f295176eaf0270427f3a737f3 (diff) | |
| download | django-rest-framework-ae6ca7456feda199124eb78f7872f969fa67d7b8.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-serializers
Diffstat (limited to 'rest_framework/tests/serializer.py')
0 files changed, 0 insertions, 0 deletions