Erik Johnston b4e2290d89 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api		2016-08-04 14:04:35 +01:00
..
__init__.py	…
client.py	…
server.py	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api	2016-08-04 14:04:35 +01:00