Weblate a42414eabd Merge remote-tracking branch 'origin/develop' into develop		2017-11-03 22:44:46 +00:00
..
components	Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms	2017-11-03 22:44:41 +00:00
i18n/strings	Translated using Weblate (French)	2017-11-01 20:04:22 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms	2017-11-03 22:44:41 +00:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	comment	2017-10-19 10:03:47 +01:00
header	copyrights for 2016	2016-01-07 04:17:56 +00:00
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00