David Baker b6c002b587 Fix merge

2018-01-08 14:35:39 +00:00

..

components

Fix merge

2018-01-08 14:35:39 +00:00

i18n/strings

Merge pull request #5613 from pafcu/simplify-translation

2017-11-16 11:54:52 +00:00

notifications

Mark some strings as translatable

2017-09-23 13:46:51 +02:00

skins/vector

Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp

2018-01-05 14:30:21 +00:00

utils

…

vector

Merge pull request #5685 from aidalgol/root-lang-attrib-fix

2017-11-30 10:12:40 +00:00

header

fix (C)

2017-10-22 15:21:58 +01:00

VectorConferenceHandler.js

replace q method calls with bluebird ones

2017-07-13 00:50:01 +01:00