diff options
| author | Dan McGee <dan@archlinux.org> | 2012-03-23 20:19:34 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-23 20:19:34 -0500 |
| commit | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (patch) | |
| tree | 1af0836c927b87e2249628d47cdfefe77c3b18fd /releng/urls.py | |
| parent | ea87160c397fe1daf63851f0ed0be146bea79196 (diff) | |
| parent | 8e10699d53281be53c88a3695de6aa496e084dc6 (diff) | |
| download | archweb-822898e57bc6d4e008ef58da309857e9ef8c98e6.tar.gz archweb-822898e57bc6d4e008ef58da309857e9ef8c98e6.zip | |
Merge branch 'django14'
Conflicts:
templates/releng/result_section.html
Diffstat (limited to 'releng/urls.py')
| -rw-r--r-- | releng/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/releng/urls.py b/releng/urls.py index 239ad02b..8d1b8f24 100644 --- a/releng/urls.py +++ b/releng/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import include, patterns +from django.conf.urls import include, patterns feedback_patterns = patterns('releng.views', (r'^$', 'test_results_overview', {}, 'releng-test-overview'), |