diff options
| author | Tom Christie | 2014-01-14 20:35:26 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-01-14 20:35:26 +0000 |
| commit | 8f6983ee6efda28083c058913febc0632670dacd (patch) | |
| tree | 82213cad72e08f71e442508aaa821346bc953fb9 /rest_framework/settings.py | |
| parent | dde3b1dfcb5490712ee462fcf360395da0b5d4fd (diff) | |
| parent | ed8143b2b05cd16952262c939b15053f7b93893a (diff) | |
| download | django-rest-framework-8f6983ee6efda28083c058913febc0632670dacd.tar.bz2 | |
Merge branch 'master' of git://github.com/sprymak/django-rest-framework into sprymak-master
Diffstat (limited to 'rest_framework/settings.py')
| -rw-r--r-- | rest_framework/settings.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8abaf140..ce171d6d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -95,6 +95,7 @@ DEFAULTS = { 'URL_FORMAT_OVERRIDE': 'format', 'FORMAT_SUFFIX_KWARG': 'format', + 'URL_FIELD_NAME': 'url', # Input and output formats 'DATE_INPUT_FORMATS': ( |