Pierre-antoine Comby ab8888a085 Merge branch 'master' into 'alias' ... # Conflicts: # note_kfet/settings/base.py # note_kfet/urls.py		2020-03-06 21:49:46 +01:00
..
__init__.py	Remove redundant ; and import local settings	2020-02-18 13:03:58 +01:00
base.py	Merge branch 'master' into 'alias'	2020-03-06 21:49:46 +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