Merge branch 'master' into Kerl/calendar
This commit is contained in:
commit
2632c9dff8
58 changed files with 1564 additions and 488 deletions
|
@ -49,6 +49,7 @@ INSTALLED_APPS = (
|
|||
'captcha',
|
||||
'django_cas_ng',
|
||||
'debug_toolbar',
|
||||
'bootstrapform',
|
||||
)
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue