Livvy Mackintosh a77ccd8a3d Merge branch 'master' of http://translate.ojuso.org/git/platform/map ... Conflicts: support/locale/fr/LC_MESSAGES/django.po		2017-10-11 23:21:28 +01:00
..
django.po	Merge branch 'master' of http://translate.ojuso.org/git/platform/map	2017-10-11 23:21:28 +01:00