summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-28 18:01:01 -0500
committerDan McGee <dan@archlinux.org>2011-04-28 18:01:01 -0500
commitb87a2c4864db79b29df1e2ea3ac3c3c2759f05fa (patch)
tree97defc7569c5e52161681576296ba90bff47f62a /urls.py
parent174d04ad0334b1c441bc0237e3e2ed8f581575ef (diff)
parent461d27d75ffb36ad4e7f428b8b6722ae1d3afb98 (diff)
Merge branch 'releng'
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/urls.py b/urls.py
index cc8b593a..36a2d79f 100644
--- a/urls.py
+++ b/urls.py
@@ -73,6 +73,7 @@ urlpatterns += patterns('',
(r'^mirrors/', include('mirrors.urls')),
(r'^news/', include('news.urls')),
(r'^packages/', include('packages.urls')),
+ (r'^releng/', include('releng.urls')),
(r'^todo/', include('todolists.urls')),
(r'^opensearch/packages/$', 'packages.views.opensearch',
{}, 'opensearch-packages'),
@@ -81,7 +82,7 @@ urlpatterns += patterns('',
if settings.DEBUG == True:
urlpatterns += patterns('',
- (r'^media/(.*)$', 'django.views.static.serve',
+ (r'^media/(.*)$', 'django.views.static.serve',
{'document_root': os.path.join(settings.DEPLOY_PATH, 'media')}))
# vim: set ts=4 sw=4 et: