Weblate 8216d8999c Merge branch 'develop' of https://github.com/vector-im/riot-web into develop ... Conflicts: src/i18n/strings/cs.json src/i18n/strings/fr.json src/i18n/strings/nb_NO.json src/i18n/strings/nl.json src/i18n/strings/pt_BR.json		2017-10-12 16:24:36 +00:00
..
strings	Merge branch 'develop' of https://github.com/vector-im/riot-web into develop	2017-10-12 16:24:36 +00:00