Travis Ralston 45ca890f68 Merge remote-tracking branch 'vector-im/develop' into travis/presence		2017-10-25 11:27:22 -06:00
..
components	Merge remote-tracking branch 'vector-im/develop' into travis/presence	2017-10-25 11:27:22 -06:00
i18n/strings	Remove i18n for making the merge easier	2017-10-25 11:27:16 -06:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge remote-tracking branch 'vector-im/develop' into travis/presence	2017-10-25 11:27:22 -06: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