Richard van der Hoff 4f8baab0c4 Merge branch 'master' into develop		2018-09-06 13:05:22 +01:00
..
__init__.py	Remove redundated BaseHomeServer	2016-01-26 13:52:29 +00:00
client.py	Merge pull request #3735 from matrix-org/travis/federation-spelling	2018-08-22 09:34:21 +01:00
server.py	Merge branch 'master' into develop	2018-09-06 13:05:22 +01:00