Weblate 9c7783b439 Merge remote-tracking branch 'origin/develop' into develop

2018-01-08 15:00:51 +00:00

..

components

Fix merge

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

i18n/strings

Translated using Weblate (Chinese (Simplified))

2018-01-08 02:02:11 +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

PR feedback

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

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