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
..
2017-10-11 22:16:43 +01:00
2017-10-11 22:16:43 +01:00