David Baker 92d5f55a46 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display		2017-03-17 13:55:07 +00:00
..
structures	Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display	2017-03-17 13:55:07 +00:00
views	Merge pull request #759 from matrix-org/luke/display-redactions-better	2017-03-16 17:14:10 +00:00