David Baker f3a4856593 Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join		2017-09-14 23:09:26 +01:00
..
structures	Make /join join again	2017-09-14 23:06:00 +01:00
views	Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button	2017-09-14 10:38:26 +01:00