Neil Alexander 0157af541f Merge branch 'master' into hs/as-transaction-send-if-in-room		2021-03-03 14:36:02 +00:00
..
helpers	Increase gocyclo complexity to 25 (and remove all but 2 golint directives related to it) (#1783)	2021-03-03 14:35:57 +00:00
input	Fix crash in membership updater (#1753)	2021-02-06 11:49:18 +00:00
perform	Increase gocyclo complexity to 25 (and remove all but 2 golint directives related to it) (#1783)	2021-03-03 14:35:57 +00:00
query	Merge branch 'master' into hs/as-transaction-send-if-in-room	2021-03-03 14:36:02 +00:00
alias.go	Fix #1655 by re-adding the appservice alias query (#1660)	2020-12-18 13:33:28 +00:00
api.go	Peeking over federation via MSC2444 (#1391)	2021-01-22 14:55:08 +00:00