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
..
components	FilteredList, now being a controlled component does not need state	2018-01-25 21:06:35 +00:00
i18n/strings	Merge branch 'develop' of https://github.com/vector-im/riot-web into develop	2018-02-01 10:24:21 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear	2018-01-24 18:53:33 +01:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Merge pull request #5685 from aidalgol/root-lang-attrib-fix	2017-11-30 10:12:40 +00:00
header	fix (C)	2017-10-22 15:21:58 +01:00
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00