jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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 = {