Mark Haines b8d49be5a1 Merge branch 'develop' into markjh/twisted-15 ... Conflicts: synapse/python_dependencies.py		2015-06-01 10:56:05 +01:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
client.py	Correctly pass connection pool parameter	2015-05-28 16:48:53 +01:00
endpoint.py	Update copyright notices	2015-01-06 13:21:39 +00:00
matrixfederationclient.py	Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our own Agent	2015-06-01 10:51:50 +01:00
server.py	Remove log line	2015-05-29 15:03:24 +01:00
servlet.py	Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator	2015-04-21 16:35:53 +01:00