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
..
LC_MESSAGES	Merge remote-tracking branch 'origin/master' into tresorerie	2020-03-22 01:04:03 +01:00