Neil Alexander 29ef6e0679 Merge branch 'master' into neilalexander/sarama-import		2020-04-22 14:19:27 +01:00
..
eduserver.go	Implement typing over federation (#949)	2020-03-30 16:40:28 +01:00
roomserver.go	Invites v2 endpoint (#952)	2020-04-03 14:29:06 +01:00
syncapi.go	Fix sarama import URLs	2020-01-25 21:32:54 +00:00
userupdate.go	Fix sarama import URLs	2020-01-25 21:32:54 +00:00