comparison hgscm/urls.py @ 84:35f8d279bd70

merge
author Arne Babenhauserheide <bab@draketo.de>
date Sat, 28 Feb 2009 15:04:45 +0100
parents e8119809dfab
children
comparison
equal deleted inserted replaced
83:cea1ca632c04 84:35f8d279bd70
6 (r'^', include('hgscm.apps.www.urls')), 6 (r'^', include('hgscm.apps.www.urls')),
7 7
8 (r'^media/(?P<path>.*)$', 'django.views.static.serve', 8 (r'^media/(?P<path>.*)$', 'django.views.static.serve',
9 { 'document_root': os.path.join(settings.MEDIA_ROOT) }), 9 { 'document_root': os.path.join(settings.MEDIA_ROOT) }),
10 10
11 (r'^favicon\.ico$', 'django.views.static.serve', {'document_root': os.path.join(settings.MEDIA_ROOT), 'path': 'images/favicon.ico'}),
11 # Uncomment the next line to enable the admin: 12 # Uncomment the next line to enable the admin:
12 # (r'^admin/(.*)', admin.site.root), 13 # (r'^admin/(.*)', admin.site.root),
13 ) 14 )