Weblate 0e3fbb6770 Merge branch 'develop' of https://github.com/vector-im/riot-web into develop ... Conflicts: src/i18n/strings/de_DE.json src/i18n/strings/hu.json src/i18n/strings/ru.json src/i18n/strings/zh_Hant.json		2017-10-20 10:29:12 +00:00
..
components	Groups->Communities	2017-10-19 15:07:22 +01:00
i18n/strings	Merge branch 'develop' of https://github.com/vector-im/riot-web into develop	2017-10-20 10:29:12 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Adjust CSS in MyGroups, justify-content:space-around	2017-10-19 18:08:52 +01:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	comment	2017-10-19 10:03:47 +01:00
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00
header	copyrights for 2016	2016-01-07 04:17:56 +00:00