Richard Lewis 48b3075e44 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes

2017-08-17 17:20:21 +01:00

..

components

Merge pull request #4777 from vector-im/luke/fix-quick-search-nav

2017-08-11 10:52:36 +01:00

i18n/strings

Fix translations

2017-08-15 18:23:11 +01:00

notifications

Translate notification strings

2017-05-30 17:39:41 +01:00

skins/vector

Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes

2017-08-17 17:20:21 +01:00

utils

…

vector

Allow Riot to load up different configs depending on the domain (#4575)

2017-07-14 15:05:07 +01:00

header

…

VectorConferenceHandler.js

replace q method calls with bluebird ones

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