diff options
| author | Mark Aaron Shirley | 2013-05-08 22:39:48 -0700 |
|---|---|---|
| committer | Mark Aaron Shirley | 2013-05-08 22:39:48 -0700 |
| commit | e550740b3d07e9f89e89941ee6be1101c7770e9a (patch) | |
| tree | 7e26d3e76479f16302e2fade1890c35fe3c1b445 /rest_framework/tests/relations.py | |
| parent | 7e0a93f0eefead25f0e9b6615675f394af3a4ba0 (diff) | |
| parent | 4ab7b8f257f9d3a1b35d34d0f90f0103b0cc6369 (diff) | |
| download | django-rest-framework-e550740b3d07e9f89e89941ee6be1101c7770e9a.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts:
rest_framework/tests/relations_nested.py
Diffstat (limited to 'rest_framework/tests/relations.py')
0 files changed, 0 insertions, 0 deletions