Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master

Conflicts: mayan/settings/includes/common.py
2014-07-11 00:32:50 -04:00
parent c35c040513 a05424c799
commit 972aa02976
13 changed files with 147 additions and 99 deletions
--- a/mayan/urls.py
+++ b/mayan/urls.py
@@ -62,6 +62,12 @@ if settings.DEBUG:
    urlpatterns += staticfiles_urlpatterns()

    if 'rosetta' in settings.INSTALLED_APPS:
-        urlpatterns += patterns('',
-            url(r'^rosetta/', include('rosetta.urls'), name='rosetta'),
-        )
+        urlpatterns += patterns(
+            '',
+            url(r'^rosetta/', include('rosetta.urls'), name='rosetta'))
+
+    import debug_toolbar
+    urlpatterns += patterns(
+        '',
+        url(r'^__debug__/', include(debug_toolbar.urls)))
+