Matthew Hodgson 5bb2992f93 Merge pull request #5281 from turt2live/travis/display-name-lightbox ... Don't use MXIDs on the lightbox if possible		2017-10-14 22:46:13 +01:00
..
components	Don't use MXIDs on the lightbox if possible	2017-10-13 20:18:55 -06:00
i18n/strings	Merge branch 'develop' of https://github.com/vector-im/riot-web into develop	2017-10-12 16:24:36 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge pull request #5267 from turt2live/travis/alone_warning_css	2017-10-14 22:44:58 +01:00
utils
vector	ElectronPlatform: Import desktopCapturer explicitly	2017-09-25 17:19:04 +02:00
header
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00