Travis Ralston 5845a1ec7a Merge branch 'develop' into travis/remove-presence		2018-04-11 15:18:30 -06:00
..
components	Merge branch 'develop' into travis/remove-presence	2018-04-11 15:18:30 -06:00
i18n/strings	Translated using Weblate (Polish)	2018-04-09 13:12:22 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge branch 'develop' into travis/remove-presence	2018-04-11 15:18:30 -06:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Merge pull request #6317 from vector-im/dbkr/og_image_sort_of_configurable	2018-03-15 09:21:12 +00:00
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00
header	fix (C)	2017-10-22 15:21:58 +01:00