CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-14 16:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'django110'

Browse Source
This commit is contained in:
Raphael Michel
2016-10-03 10:31:49 +02:00
parent 1ac6fb71b3 b6a34975a9
commit d00eb41222
26 changed files with 130 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/settings.py
View File

@@ -193,7 +193,7 @@ CORE_MODULES = {
("pretix", "control")
}
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
'pretix.multidomain.middlewares.MultiDomainMiddleware',
'pretix.multidomain.middlewares.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
@@ -212,7 +212,7 @@ try:
import debug_toolbar # noqa
if DEBUG:
INSTALLED_APPS.append('debug_toolbar.apps.DebugToolbarConfig')
MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
MIDDLEWARE.append('pretix.helpers.debug.DebugMiddlewareCompatibilityShim')
except ImportError:
pass