diff options
| author | Markus Törnqvist | 2013-05-18 18:13:31 +0300 |
|---|---|---|
| committer | Markus Törnqvist | 2013-05-18 18:13:31 +0300 |
| commit | 48c1b2233bbfb242b68d495f51f0f177b40aa7c4 (patch) | |
| tree | 86a1630fe959518b53fcd21ccacabb43cb41ff04 /rest_framework/tests/renderers.py | |
| parent | 2795e842d60c4f1759129ab46bad6ba3e62195aa (diff) | |
| parent | 3f47eb7a77fcc735782dd1bf8e8e053e26417ea1 (diff) | |
| download | django-rest-framework-48c1b2233bbfb242b68d495f51f0f177b40aa7c4.tar.bz2 | |
Merge branch 'master' into mjtorn-master
Conflicts:
rest_framework/serializers.py
rest_framework/tests/serializer.py
Fixed conflicts
Diffstat (limited to 'rest_framework/tests/renderers.py')
0 files changed, 0 insertions, 0 deletions