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
..
__init__.py	Remove useless code	2020-03-11 15:14:51 +01:00
getenv.py	Fix template tags to make tox happy	2020-03-11 15:13:34 +01:00
pretty_money.py	Merge remote-tracking branch 'origin/master' into tresorerie	2020-03-22 01:04:03 +01:00