Neil Alexander 843139c4f1 Merge branch 'master' into nats		2021-11-24 11:00:21 +00:00
..
alias.go	Various alias fixes (#1934)	2021-07-21 16:53:50 +01:00
api.go	Merge federationapi, federationsender, signingkeyserver components (#2055)	2021-11-24 10:45:23 +00:00
api_trace.go	Merge federationapi, federationsender, signingkeyserver components (#2055)	2021-11-24 10:45:23 +00:00
input.go	Async and sync roomserver input	2021-11-08 13:02:08 +00:00
output.go	Peeking over federation via MSC2444 (#1391)	2021-01-22 14:55:08 +00:00
perform.go	Peeking over federation via MSC2444 (#1391)	2021-01-22 14:55:08 +00:00
query.go	Optimise QueryServerJoinedToRoom (#1933)	2021-07-21 13:06:32 +01:00
wrapper.go	Async and sync roomserver input	2021-11-08 13:02:08 +00:00