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

Conflicts:
	src/i18n/strings/gl.json

2018-06-20 09:13:31 +00:00

..

strings

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

2018-06-20 09:13:31 +00:00