summaryrefslogtreecommitdiff
path: root/devel/urls.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-14 22:44:27 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-14 22:44:27 -0500
commit64f6dd9cb41ddbc84376549f558ed7d52d9e600a (patch)
tree81f31f1ceb5fc6e4d94508d273003996e036191c /devel/urls.py
parentbc432a1ff0e69bf45c5f3b97077a13952611196d (diff)
parentb2b5c1a064d5d3c33f4c4fc119bd67cf9ca1b7ba (diff)
Merge tag 'release_2012-01-11'
Pkgbase view in todos, other changes related to caching Conflicts: public/views.py
Diffstat (limited to 'devel/urls.py')
-rw-r--r--devel/urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/urls.py b/devel/urls.py
index bc3bcace..07cb321b 100644
--- a/devel/urls.py
+++ b/devel/urls.py
@@ -7,8 +7,8 @@ urlpatterns = patterns('devel.views',
(r'^$', 'index', {}, 'devel-index'),
(r'^newuser/$', 'new_user_form'),
(r'^profile/$', 'change_profile'),
- (r'^reports/(?P<report>.*)/(?P<username>.*)/$', 'report'),
- (r'^reports/(?P<report>.*)/$', 'report'),
+ (r'^reports/(?P<report_name>.*)/(?P<username>.*)/$', 'report'),
+ (r'^reports/(?P<report_name>.*)/$', 'report'),
)
# vim: set ts=4 sw=4 et: