Weblate 1d43870433 Merge branch 'develop' of https://github.com/vector-im/riot-web into develop ... Conflicts: src/i18n/strings/da.json src/i18n/strings/eo.json src/i18n/strings/fr.json src/i18n/strings/hu.json src/i18n/strings/ja.json src/i18n/strings/nl.json src/i18n/strings/pl.json src/i18n/strings/sk.json src/i18n/strings/zh_Hans.json		2018-04-20 14:17:09 +00:00
..
strings	Merge branch 'develop' of https://github.com/vector-im/riot-web into develop	2018-04-20 14:17:09 +00:00