ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 01:48:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'tresorerie'

Browse Source 
# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
This commit is contained in:
ynerant
2020-03-25 00:30:14 +01:00
parent 075cb1b592 0ac94547d1
commit 57a01c48a8
12 changed files with 167 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
note_kfet/settings/base.py
View File

@ -128,7 +128,6 @@ PASSWORD_HASHERS = [
AUTHENTICATION_BACKENDS = (
'permission.backends.PermissionBackend', # Custom role-based permission system
'cas.backends.CASBackend', # For CAS connections
)
REST_FRAMEWORK = {