summaryrefslogtreecommitdiffstats
path: root/askbot/setup_templates
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2012-05-15 15:25:07 -0600
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2012-05-15 15:25:07 -0600
commitfe2bd64fcf4767c3801af4451e347365d288b15d (patch)
treeb61e513ee6bc0ff06a4a85e4d8f02f42941121b3 /askbot/setup_templates
parent32a4a5ddf93f2bc605706ecc3eafbc63dc923acf (diff)
parent4cf3ec3998b1f067a7f0c76eae4a90c274024986 (diff)
downloadaskbot-fe2bd64fcf4767c3801af4451e347365d288b15d.tar.gz
askbot-fe2bd64fcf4767c3801af4451e347365d288b15d.tar.bz2
askbot-fe2bd64fcf4767c3801af4451e347365d288b15d.zip
Merge branch 'master' into livesettings_fix
Diffstat (limited to 'askbot/setup_templates')
-rw-r--r--askbot/setup_templates/settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 104ea64b..632c4e70 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -98,7 +98,7 @@ TEMPLATE_LOADERS = (
MIDDLEWARE_CLASSES = (
#'django.middleware.gzip.GZipMiddleware',
- 'askbot.middleware.locale.LocaleMiddleware',
+ #'askbot.middleware.locale.LocaleMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
#'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',