Robert Swain b047f1caaa Merge branch 'develop' into rob/electron-screensharing		2017-09-25 17:02:30 +02:00
..
structures	Merge pull request #1418 from matrix-org/luke/groups-summary-store	2017-09-25 14:59:32 +01:00
views	Merge branch 'develop' into rob/electron-screensharing	2017-09-25 17:02:30 +02:00