Neil Alexander 485e18e9fd Merge branch 'master' into piotr-kozimor/threepid-sessions-in-userapi		2022-01-06 09:40:12 +00:00
..
invites.go	Add NATS JetStream support (#1866)	2022-01-05 17:44:49 +00:00
threepid.go	Cherry-pick Feature/login with email (#2)	2021-09-14 17:41:49 +02:00