diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 22:44:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 22:44:27 -0500 |
| commit | 64f6dd9cb41ddbc84376549f558ed7d52d9e600a (patch) | |
| tree | 81f31f1ceb5fc6e4d94508d273003996e036191c /settings.py | |
| parent | bc432a1ff0e69bf45c5f3b97077a13952611196d (diff) | |
| parent | b2b5c1a064d5d3c33f4c4fc119bd67cf9ca1b7ba (diff) | |
Merge tag 'release_2012-01-11'
Pkgbase view in todos, other changes related to caching
Conflicts:
public/views.py
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/settings.py b/settings.py index f7524d93..6c949a86 100644 --- a/settings.py +++ b/settings.py @@ -67,7 +67,6 @@ TEMPLATE_LOADERS = ( # This bug is a real bummer: # http://code.djangoproject.com/ticket/14105 MIDDLEWARE_CLASSES = ( - 'main.middleware.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -75,7 +74,6 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.http.ConditionalGetMiddleware', 'django.middleware.doc.XViewMiddleware', - 'django.middleware.cache.FetchFromCacheMiddleware', ) ROOT_URLCONF = 'urls' |