diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-01-02 01:33:11 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-01-02 01:33:11 +0000 |
| commit | 544ab30ed71e0d78c4c061008758de29ff79e8f7 (patch) | |
| tree | 55c710a12a6552bd461d621e38c0d6fa526f5ef6 /django/conf/project_template/settings.py | |
| parent | 7a89d3d503cad96689fee3028a218ff5456f73f1 (diff) | |
Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf/project_template/settings.py')
| -rw-r--r-- | django/conf/project_template/settings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py index e0265579b8..4f9fdcb38f 100644 --- a/django/conf/project_template/settings.py +++ b/django/conf/project_template/settings.py @@ -48,7 +48,7 @@ USE_L10N = True MEDIA_ROOT = '' # 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). +# trailing slash. # Examples: "http://media.lawrence.com/media/", "http://example.com/media/" MEDIA_URL = '' |