Weblate a6155c98ec Merge branch 'develop' of https://github.com/vector-im/riot-web into develop ...

Conflicts:
	src/i18n/strings/eo.json

2018-02-01 10:24:21 +00:00

..

strings

Merge branch 'develop' of https://github.com/vector-im/riot-web into develop

2018-02-01 10:24:21 +00:00