Luke Barnard bbcf46bb69 Merge branch 'develop' of github.com:vector-im/riot-web into develop

2017-10-12 18:12:14 +01:00

..

components

switch to new logos, and use import rather than VAR

2017-10-11 16:46:05 +01: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 branch 'develop' of github.com:vector-im/riot-web into develop

2017-10-12 18:12:14 +01:00

utils

PR feedback

2016-12-16 16:24:24 +00:00

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