Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular		2017-11-13 12:25:56 -07:00
..
components	Merge branch 'develop' into travis/granular	2017-11-13 12:25:56 -07:00
i18n/strings	Translated using Weblate (Slovak)	2017-11-09 16:49:31 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:37 -08:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Merge branch 'develop' into travis/granular	2017-11-13 12:25:56 -07: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