lukebarnard 57fb09dfb7 Fix dodgy merge done in 874a7bf ... where develop branch should have been used for a chunk of code		2018-01-02 19:26:56 +00:00
..
structures	Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting	2018-01-02 19:02:33 +00:00
views	Fix dodgy merge done in 874a7bf	2018-01-02 19:26:56 +00:00