Luke Barnard ae23664a41 Merge branch 'develop' into luke/redesign-user-settings-pwd-warn		2017-06-20 15:03:10 +01:00
..
components	Give _t to PasswordNagBar, add CSS for UserSettings password warning	2017-06-20 11:23:34 +01:00
i18n/strings	Merge pull request #4366 from vector-im/luke/feature-user-settings-password-warning	2017-06-20 14:31:12 +01:00
notifications	Translate notification strings	2017-05-30 17:39:41 +01:00
skins/vector	CSS for redeisng of password warning	2017-06-20 15:01:39 +01:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Tweak tests to match updates to matrixchat	2017-06-19 08:55:54 +01:00
header
VectorConferenceHandler.js