Neil Alexander 8d4e5b447a Merge branch 'master' into nats		2021-12-16 10:49:09 +00:00
..
conn	Fixes for multiple Pinecone peers	2021-11-25 11:18:01 +00:00
embed	Run gofmt on dendrite - apply go 1.17 preferred build tags (#2021)	2021-11-02 16:48:48 +00:00
rooms	Merge federationapi, federationsender, signingkeyserver components (#2055)	2021-11-24 10:45:23 +00:00
main.go	Merge branch 'master' into nats	2021-12-16 10:49:09 +00:00