Neil Alexander aad3e573e9 Merge branch 'master' into neilalexander/synctokens2		2020-12-17 13:04:54 +00:00
..
clientapi.go	Refactor sync tokens (#1628)	2020-12-10 18:57:10 +00:00
eduserver_receipts.go	Tweak typing	2020-12-14 16:55:55 +00:00
eduserver_sendtodevice.go	Refactor sync tokens (#1628)	2020-12-10 18:57:10 +00:00
eduserver_typing.go	Tweak typing	2020-12-14 16:55:55 +00:00
keychange.go	De-map device list positions in streaming tokens (#1642)	2020-12-15 15:09:10 +00:00
roomserver.go	Refactor sync tokens (#1628)	2020-12-10 18:57:10 +00:00