6 commits

Author	SHA1	Message	Date
hera	0ebd376a53	Reenable presence	2017-05-03 08:48:47 +00:00
Erik Johnston	b6b1382be1	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	2017-03-15 16:08:46 +00:00
Erik Johnston	6c82de5100	Format presence events on the edges instead of reformatting them multiple times	2017-03-15 14:27:34 +00:00
Matrix	8d910ff5b9	Local changes	2017-02-24 16:01:57 +00:00
Erik Johnston	feec718265	Shuffle receipt handler around so that worker apps don't need to load it	2016-11-23 15:14:24 +00:00
Erik Johnston	87528f0756	Support /initialSync in synchrotron worker	2016-09-21 11:46:28 +01:00