diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:01:52 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:01:52 -0300 |
| commit | a8b2fc84ba96c83ec1addf89ac04608fbf572705 (patch) | |
| tree | 6f54cbe43b8684908f2e80ba311272c06fd0fd08 /devel/urls.py | |
| parent | 294bf173236610fc8c308f81d8617e7e0d0e4bff (diff) | |
| parent | b0bad20756549df5edf726771c8e6869caba6244 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/base.html
Diffstat (limited to 'devel/urls.py')
| -rw-r--r-- | devel/urls.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/urls.py b/devel/urls.py index 8759562e..bc3bcace 100644 --- a/devel/urls.py +++ b/devel/urls.py @@ -3,8 +3,8 @@ from django.conf.urls.defaults import patterns urlpatterns = patterns('devel.views', (r'^admin_log/$','admin_log'), (r'^admin_log/(?P<username>.*)/$','admin_log'), - (r'^clock/$', 'clock'), - (r'^$', 'index'), + (r'^clock/$', 'clock', {}, 'devel-clocks'), + (r'^$', 'index', {}, 'devel-index'), (r'^newuser/$', 'new_user_form'), (r'^profile/$', 'change_profile'), (r'^reports/(?P<report>.*)/(?P<username>.*)/$', 'report'), |