Neil Alexander 730e0b77ca Merge branch 'master' into piotr-kozimor/threepid-sessions-in-userapi		2021-12-03 17:22:43 +00:00
..
msc2946.go	Merge federationapi, federationsender, signingkeyserver components (#2055)	2021-11-24 10:45:23 +00:00
msc2946_test.go	Merge branch 'master' into piotr-kozimor/threepid-sessions-in-userapi	2021-12-03 17:22:43 +00:00
storage.go	MSC2946: Use new MSC1772 format for space parents (#1713)	2021-01-15 12:30:41 +00:00