Livvy Mackintosh f91b4d2a2a Merge remote-tracking branch 'weblate/master'
Conflicts:
	support/locale/es/LC_MESSAGES/django.po
	support/locale/fr/LC_MESSAGES/django.po
2017-10-27 15:46:38 +01:00
..
2017-05-23 01:13:43 +02:00
dehydrated @ 0be0ab083f
2017-08-21 20:16:02 +02:00