Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql		2015-01-30 11:10:37 +00:00
..
__init__.py	…
agent_name.py	…
client.py	…
endpoint.py	…
matrixfederationclient.py	…
server.py	…
server_key_resource.py	…
servlet.py	…