ynerant 6f7374710b Merge branch 'master' into 'logging' ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po		2020-03-07 10:32:17 +01:00
..
LC_MESSAGES	Merge branch 'master' into 'logging'	2020-03-07 10:32:17 +01:00