Merge branch 'master' into Kerl/calendar

This commit is contained in:
Martin Pépin 2016-07-29 20:17:04 +02:00
commit 2632c9dff8
58 changed files with 1564 additions and 488 deletions

View file

@ -49,6 +49,7 @@ INSTALLED_APPS = (
'captcha',
'django_cas_ng',
'debug_toolbar',
'bootstrapform',
)
MIDDLEWARE_CLASSES = (