Files
element-web/src
Weblate 54561b655a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/bg.json
	src/i18n/strings/da.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/eo.json
	src/i18n/strings/eu.json
	src/i18n/strings/gl.json
	src/i18n/strings/it.json
	src/i18n/strings/ja.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/sk.json
	src/i18n/strings/zh_Hans.json
2018-04-20 13:57:45 +00:00
..
2018-04-13 01:34:16 +01:00
2018-03-28 10:31:03 +01:00
2018-03-29 16:24:03 +01:00
2018-02-25 23:00:46 +00:00
2018-04-02 10:02:41 +01:00
2018-02-28 00:49:14 +00:00
2018-04-11 18:31:54 +01:00
2018-04-02 10:02:41 +01:00