Luke Barnard 66985e6d08 Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd		2017-05-16 13:59:54 +01:00
..
structures	Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password	2017-05-16 12:29:23 +01:00
views	Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd	2017-05-16 13:59:54 +01:00