Travis Ralston d58ff90ec1 Merge branch 'develop' into travis/permalink-routing		2018-10-25 15:23:33 -06:00
..
structures	Merge remote-tracking branch 'origin/develop' into travis/permalink-routing	2018-10-24 16:36:39 -06:00
views	Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement	2018-10-25 16:23:13 +01:00