Michael Telatynski bf6a3470b4 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings

2017-10-04 22:35:58 +01:00

..

components

Fix bug that made sub list placeholders not show for ILAG etc.

2017-10-04 15:58:40 +01:00

i18n/strings

Merge pull request #5110 from pafcu/mark-and-remove-translations

2017-10-04 10:24:36 +01: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 set_default_federate_by_settings

2017-10-04 22:35:58 +01:00

utils

…

vector

ElectronPlatform: Import desktopCapturer explicitly

2017-09-25 17:19:04 +02:00

header

…

VectorConferenceHandler.js

…