Erik Johnston a81e0233e9 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes		2019-08-29 11:18:57 +01:00
..
__init__.py	Remove redundated BaseHomeServer	2016-01-26 13:52:29 +00:00
client.py	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	2019-08-29 11:18:57 +01:00
server.py	Merge pull request #5859 from matrix-org/rei/msc2197	2019-08-28 09:00:21 +01:00