Merge branch 'master' into 'fix_signin'
# Conflicts: # note_kfet/settings/development.py
This commit is contained in:
commit
099c761321
3 changed files with 7 additions and 5 deletions
|
|
@ -51,9 +51,10 @@ SESSION_COOKIE_AGE = 60 * 60 * 3
|
|||
|
||||
# CAS Client settings
|
||||
# Can be modified in secrets.py
|
||||
CAS_SERVER_URL = "https://note.comby.xyz/cas/"
|
||||
CAS_SERVER_URL = "http://localhost:8000/cas/"
|
||||
|
||||
|
||||
STATIC_ROOT = '' # not needed in development settings
|
||||
STATICFILES_DIRS = [
|
||||
os.path.join(BASE_DIR, 'static')]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue