aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/serializer.py
diff options
context:
space:
mode:
authorTom Christie2012-02-20 11:55:54 -0800
committerTom Christie2012-02-20 11:55:54 -0800
commitfb6df53394a87f87df5bbc124cbd5236a6fa1501 (patch)
tree6604a728f011f08961f9544f4008f4ce81d80e27 /djangorestframework/serializer.py
parent45cf5260acc4e03c6557367b5621f943d1b22d41 (diff)
parent0954765e910ec9fb01f9ac0285a3a51cde586949 (diff)
downloaddjango-rest-framework-fb6df53394a87f87df5bbc124cbd5236a6fa1501.tar.bz2
Merge pull request #171 from scfarley/master
URLObject v2.0.0 changed its API
Diffstat (limited to 'djangorestframework/serializer.py')
0 files changed, 0 insertions, 0 deletions