aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/runtests/settings.py
diff options
context:
space:
mode:
authorMarko Tibold2011-12-30 01:37:32 +0100
committerMarko Tibold2011-12-30 01:37:32 +0100
commit1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch)
tree9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /djangorestframework/runtests/settings.py
parent91cee26ad89c04a70f33ae334150dd127f900474 (diff)
parenta0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff)
downloaddjango-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'djangorestframework/runtests/settings.py')
-rw-r--r--djangorestframework/runtests/settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py
index 9b3c2c92..07855fa7 100644
--- a/djangorestframework/runtests/settings.py
+++ b/djangorestframework/runtests/settings.py
@@ -55,7 +55,7 @@ MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
+# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/'
# Make this unique, and don't share it with anybody.