Merge branch 'master' into aureplop/kfet_config

This commit is contained in:
Aurélien Delobelle 2017-04-08 18:36:28 +02:00
commit 784ba9bd10
29 changed files with 1331 additions and 833 deletions

View file

@ -84,7 +84,7 @@ urlpatterns = [
url(r'^k-fet/', include('kfet.urls')),
]
if settings.DEBUG:
if 'debug_toolbar' in settings.INSTALLED_APPS:
import debug_toolbar
urlpatterns += [
url(r'^__debug__/', include(debug_toolbar.urls)),