Neil Alexander 9bc0731ec4 Merge branch 'master' into nats		2021-12-03 17:35:36 +00:00
..
msc2836	Merge branch 'master' into nats	2021-12-03 17:35:36 +00:00
msc2946	Add missing HTTP mode for userapi (#1982)	2021-12-03 17:18:35 +00:00
mscs.go	Merge federationapi, federationsender, signingkeyserver components (#2055)	2021-11-24 10:45:23 +00:00