Kegan Dougal ae7b2d54bb Merge branch 'develop' into kegan/guest-access		2016-01-05 11:39:36 +00:00
..
structures	Merge branch 'develop' into kegan/guest-access	2016-01-05 11:39:36 +00:00
views	Merge pull request #76 from matrix-org/kegan/bugfix-read-receipt	2016-01-05 11:26:04 +00:00