aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/models.py
diff options
context:
space:
mode:
authorAymeric Augustin2013-12-15 13:16:12 +0100
committerAymeric Augustin2013-12-15 13:16:12 +0100
commit35a1cb5e27889931a3a94ad095b742a91399eee5 (patch)
treea3db8169a9c23e0cf02a6dd7b5f7eae9e97e1f23 /debug_toolbar/models.py
parentf9420501367bb4e8eb65c3b131185f2544710bf5 (diff)
parent38de94d2d6586c716256838e41abe518898030d6 (diff)
downloaddjango-debug-toolbar-35a1cb5e27889931a3a94ad095b742a91399eee5.tar.bz2
Merge branch 'master' into 1.0-release
Diffstat (limited to 'debug_toolbar/models.py')
-rw-r--r--debug_toolbar/models.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/debug_toolbar/models.py b/debug_toolbar/models.py
index c9a12d8..4e624fa 100644
--- a/debug_toolbar/models.py
+++ b/debug_toolbar/models.py
@@ -51,9 +51,9 @@ def patch_root_urlconf():
reverse('djdt:render_panel')
except NoReverseMatch:
urlconf_module = import_module(settings.ROOT_URLCONF)
- urlconf_module.urlpatterns += patterns('', # noqa
+ urlconf_module.urlpatterns = patterns('', # noqa
url(r'^__debug__/', include(debug_toolbar.urls)),
- )
+ ) + urlconf_module.urlpatterns
clear_url_caches()