ynerant bef4958759 Merge branch 'master' into 'devalidation_reason' ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po		2020-03-27 13:52:48 +01:00
..
django.po	Merge branch 'master' into 'devalidation_reason'	2020-03-27 13:52:48 +01:00