Mark Haines 342fb8dae9 Merge branch 'release-v0.18.6' into develop		2016-12-29 17:33:46 +00:00
..
__init__.py	…
client.py	…
endpoint.py	Merge branch 'release-v0.18.6' into develop	2016-12-29 17:33:46 +00:00
matrixfederationclient.py	…
server.py	…
servlet.py	…
site.py	…