Mercurial > public > sg101

changeset 954:e56455f4626b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Tue, 26 May 2015 20:40:31 -0500
parents 0a2f23d5bec4 (diff) 8647a669edb4 (current diff)
children 71a671dab55d
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/sg101/settings/base.py	Tue May 19 21:08:45 2015 -0500
+++ b/sg101/settings/base.py	Tue May 26 20:40:31 2015 -0500
@@ -75,6 +75,7 @@
     'core.middleware.InactiveUserMiddleware',
     'core.middleware.WhosOnline',
     'wiki.middleware.WikiMiddleware',
+    'waffle.middleware.WaffleMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 ]
 
@@ -111,6 +112,7 @@
     'haystack',
     'queued_search',
     'tagging',
+    'waffle',
     'accounts',
     'antispam',
     'bandmap',