Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular		2017-11-14 19:16:35 -07:00
..
components	Merge branch 'develop' into travis/granular	2017-11-14 19:16:35 -07:00
i18n/strings	Merge pull request #5286 from turt2live/travis/presence	2017-11-14 23:53:26 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	fix buttons on dark theme	2017-11-15 01:56:32 +00:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Merge branch 'develop' into travis/granular	2017-11-14 19:16:35 -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