MSC3613: Combinatorial join rules#3613

turt2live wants to merge 5 commits intomainmatrix-org/matrix-spec-proposals:mainfrom

travis/msc/simplified-join-rulesmatrix-org/matrix-spec-proposals:travis/msc/simplified-join-rulesCopy head branch name to clipboard