Erik Johnston 67b73fd147 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes		2019-06-21 13:27:04 +01:00
..
__init__.py	Combine the CurrentStateDeltaStream into the EventStream	2019-03-27 22:07:05 +00:00
_base.py	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	2019-06-21 13:27:04 +01:00
events.py	Run Black. (#5482)	2019-06-20 19:32:02 +10:00
federation.py	Run Black. (#5482)	2019-06-20 19:32:02 +10:00