Weblate 4b5deaf17f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop ...

Conflicts:
	src/i18n/strings/fr.json

2017-06-22 20:39:48 +00:00

..

strings

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop

2017-06-22 20:39:48 +00:00