Merge branch 'master' into rights

2020-03-22 00:00:18 +01:00 · 2020-03-22 00:00:18 +01:00 · 6445acedc7
commit 6445acedc7
parent e2d2d2cc99 0ecef74a1c
6 changed files with 11 additions and 13 deletions
--- a/note_kfet/settings/init.py
+++ b/note_kfet/settings/init.py
@ -41,6 +41,8 @@ else:
 try:
    #in secrets.py defines everything you want
    from .secrets import *
+    INSTALLED_APPS += OPTIONAL_APPS
+
 except ImportError:
    pass

--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@ -39,8 +39,6 @@ INSTALLED_APPS = [
    'polymorphic',
    'crispy_forms',
    'django_tables2',
-    'cas_server',
-    'cas',
    # Django contrib
    'django.contrib.admin',
    'django.contrib.admindocs',