Michael Telatynski ea6e1b6f72 Merge branch 'develop' into t3chguy/warn_self_mute		2018-06-29 19:17:43 +01:00
..
structures	Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout	2018-06-29 10:49:15 +01:00
views	Merge branch 'develop' into t3chguy/warn_self_mute	2018-06-29 19:17:43 +01:00