diff options
| author | Marko Tibold | 2011-12-30 01:37:32 +0100 |
|---|---|---|
| committer | Marko Tibold | 2011-12-30 01:37:32 +0100 |
| commit | 1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch) | |
| tree | 9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /examples/settings.py | |
| parent | 91cee26ad89c04a70f33ae334150dd127f900474 (diff) | |
| parent | a0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff) | |
| download | django-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'examples/settings.py')
| -rw-r--r-- | examples/settings.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/settings.py b/examples/settings.py index c47011fd..4438bb84 100644 --- a/examples/settings.py +++ b/examples/settings.py @@ -51,7 +51,7 @@ MEDIA_ROOT = 'media/' # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/" -# NOTE: None of the djangorestframework examples serve media content via MEDIA_URL. +# NOTE: None of the djangorestframework examples serve media content via MEDIA_URL. MEDIA_URL = '' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a @@ -90,10 +90,10 @@ TEMPLATE_DIRS = ( ) # for loading initial data -##SERIALIZATION_MODULES = { +##SERIALIZATION_MODULES = { # 'yml': "django.core.serializers.pyyaml" -#} +#} INSTALLED_APPS = ( |