Merge branch 'master' into rights
This commit is contained in:
commit
6445acedc7
6 changed files with 11 additions and 13 deletions
|
|
@ -39,8 +39,6 @@ INSTALLED_APPS = [
|
|||
'polymorphic',
|
||||
'crispy_forms',
|
||||
'django_tables2',
|
||||
'cas_server',
|
||||
'cas',
|
||||
# Django contrib
|
||||
'django.contrib.admin',
|
||||
'django.contrib.admindocs',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue