David Baker 5c6189ea3e Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py		2015-01-22 17:46:16 +00:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
agent_name.py	Update copyright notices	2015-01-06 13:21:39 +00:00
client.py	Merge branch 'develop' into pushers	2015-01-13 13:15:51 +00:00
endpoint.py	Update copyright notices	2015-01-06 13:21:39 +00:00
matrixfederationclient.py	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
server.py	Oops: second part of commit dc938606	2015-01-22 17:38:53 +00:00
server_key_resource.py	Update copyright notices	2015-01-06 13:21:39 +00:00