Neil Alexander 183fb3973d Resolve merge conflicts		2020-02-11 14:50:42 +00:00
..
messages.go	Wire up publicroomsapi for roomserver events (#851)	2020-01-24 17:11:20 +00:00
routing.go	CS API: Support for /messages, fixes for /sync (#847)	2020-01-23 17:51:10 +00:00
state.go	Resolve merge conflicts	2020-02-11 14:50:42 +00:00