Matthew Hodgson 816042d3a8 Merge branch 'develop' into matthew/status		2017-11-04 23:51:20 +00:00
..
structures	Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms	2017-11-03 22:44:41 +00:00
views	Merge branch 'develop' into matthew/status	2017-11-04 23:51:20 +00:00