Yohann D'ANELLO 982b61fe03 Merge branch 'master' into 'improvements' ... # Conflicts: # locale/fr/LC_MESSAGES/django.po		2020-11-16 11:01:19 +00:00
..
fr/LC_MESSAGES	Merge branch 'master' into 'improvements'	2020-11-16 11:01:19 +00:00