aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/serializer.py
diff options
context:
space:
mode:
authorMarko Tibold2011-12-12 09:42:27 -0600
committerMarko Tibold2011-12-12 09:42:27 -0600
commit386743877909f96af17b9ae35ea18a332e5789af (patch)
treea0c32fe861718b995dfd232872f0c9d4af057575 /djangorestframework/serializer.py
parent51c53a8a5c5141f47f3cefab5d3353250422cab3 (diff)
parentcb8931a014af506c173e9d3b596e2f4aa51600cc (diff)
downloaddjango-rest-framework-386743877909f96af17b9ae35ea18a332e5789af.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'djangorestframework/serializer.py')
0 files changed, 0 insertions, 0 deletions