Yohann D'ANELLO 0884270474 Merge branch 'master' into rights ... # Conflicts: # note_kfet/settings/base.py		2020-03-07 10:42:51 +01:00
..
__init__.py	Remove redundant ; and import local settings	2020-02-18 13:03:58 +01:00
base.py	Merge branch 'master' into rights	2020-03-07 10:42:51 +01:00
development.py	Client CAS	2020-02-22 23:44:24 +01:00
production.py	Client CAS	2020-02-22 23:44:24 +01:00