Merge branch 'develop'

This commit is contained in:
Tom 2016-05-08 18:14:51 +00:00
commit 32b64f2eb7
48 changed files with 192 additions and 161 deletions

View file

@ -106,8 +106,7 @@ INSTALLED_APPS = (
# 'ungleich_page',
'hosting',
'digitalglarus',
'django_extensions',
'debug_toolbar'
)
MIDDLEWARE_CLASSES = (