From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 7 Jun 2017 15:47:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/crem' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c7204650495bcab496eff217f8894bfbc5d1ccba;p=telemeta.git

Merge remote-tracking branch 'origin/crem' into crem
---

c7204650495bcab496eff217f8894bfbc5d1ccba
diff --cc app/settings.py
index 278df98a,771cc056..38d4ca0f
--- a/app/settings.py
+++ b/app/settings.py
@@@ -242,10 -242,10 +242,12 @@@ PAGINATION_SETTINGS = 
      'PAGE_RANGE_DISPLAYED': 10,
      'MARGIN_PAGES_DISPLAYED': 2,
  }
 +
- #DEBUG_TOOLBAR_CONFIG = {
- #    'SHOW_TOOLBAR_CALLBACK': lambda x : True
- #}
+ if DEBUG:
+     DEBUG_TOOLBAR_CONFIG = {
+         'SHOW_TOOLBAR_CALLBACK': lambda x : True
+     }
++
  DEBUG_TOOLBAR_PATCH_SETTINGS = False
  DEBUG_TOOLBAR_PANELS = [
      'debug_toolbar.panels.versions.VersionsPanel',