diff options
| author | Jamie Matthews | 2012-09-26 13:09:39 +0100 |
|---|---|---|
| committer | Jamie Matthews | 2012-09-26 13:09:39 +0100 |
| commit | 4be937a9b3731c3bb86b34b07eecb059f3bb374c (patch) | |
| tree | 03d82edff6cf437481553188cf3427f26101bc8b | |
| parent | 01770c53cd9045e6ea054f32b1e40b5d2ff7fe44 (diff) | |
| parent | ffe2c6d558a4d7843a1efed0af5bd0908892ef70 (diff) | |
| download | django-rest-framework-4be937a9b3731c3bb86b34b07eecb059f3bb374c.tar.bz2 | |
Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators
* 'restframework2' of git://github.com/tomchristie/django-rest-framework:
Add missing comma
| -rw-r--r-- | rest_framework/settings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 312d707d..a498b222 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -28,7 +28,7 @@ DEFAULTS = { ), 'DEFAULT_PARSERS': ( 'rest_framework.parsers.JSONParser', - 'rest_framework.parsers.FormParser' + 'rest_framework.parsers.FormParser', 'rest_framework.parsers.MultiPartParser' ), 'DEFAULT_AUTHENTICATION': ( |