matrix-spec-proposals

f09db160 - Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt