Mercurial > public > madeira
diff mysite/urls.py @ 26:efb2da0b5d10
Merging the django1.3 branch into trunk.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Wed, 30 Mar 2011 00:16:32 +0000 |
| parents | 0dcfcdf50c62 |
| children | 903260593491 |
line wrap: on
line diff
--- a/mysite/urls.py Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/urls.py Wed Mar 30 00:16:32 2011 +0000 @@ -6,11 +6,12 @@ urlpatterns = patterns('', (r'^', include('mysite.band.urls')), + (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), (r'^photologue/', include('mysite.photologue.urls')), ) if settings.DEBUG: urlpatterns += patterns('', - (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), + (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), )