Michael Telatynski 670f02acf8 Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things

2018-01-16 18:04:08 +00:00

..

components

Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things

2018-01-16 18:04:08 +00:00

i18n/strings

change reply to be its own thing

2017-12-16 19:01:56 +00:00

notifications

Mark some strings as translatable

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

skins/vector

Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things

2018-01-16 18:04:08 +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