Yohann D'ANELLO 18f6daf2ac Merge remote-tracking branch 'origin/master' into tresorerie ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # note_kfet/settings/base.py # templates/base.html		2020-03-22 01:04:03 +01:00
..
fixtures	move cas fixture to own file	2020-03-09 18:24:31 +01:00
settings	Merge remote-tracking branch 'origin/master' into tresorerie	2020-03-22 01:04:03 +01:00
__init__.py	and so it begins	2019-07-07 20:49:02 +00:00
middlewares.py	Implements permission masks	2020-03-19 16:12:52 +01:00
urls.py	Merge remote-tracking branch 'origin/master' into tresorerie	2020-03-22 01:04:03 +01:00
wsgi.py	Unify file headers	2020-02-18 21:30:26 +01:00