diff options
| author | Michal Dvorak (cen38289) | 2012-12-21 10:53:23 +0100 |
|---|---|---|
| committer | Michal Dvorak (cen38289) | 2012-12-21 10:53:23 +0100 |
| commit | 5ba2437f2dcb4eb7f9677ff9e393c27af38b071f (patch) | |
| tree | df19512bc58ae3180813c9d479267b7a617e9b8e /rest_framework/renderers.py | |
| parent | 8ac77eaae8d6ad01ec8f6de18134c4aa1961d4dd (diff) | |
| parent | 79aea2f0d082f17e7bb75cc32bd71b5f04836d43 (diff) | |
| download | django-rest-framework-5ba2437f2dcb4eb7f9677ff9e393c27af38b071f.tar.bz2 | |
Merge remote-tracking branch 'tom/master'
Conflicts:
rest_framework/tests/serializer.py
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 1220bca1..a4ae717d 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -20,7 +20,7 @@ from rest_framework.utils import dict2xml from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework import VERSION, status -from rest_framework import serializers, parsers +from rest_framework import parsers class BaseRenderer(object): |