Jeroen b5e157d895 Merge branch 'develop' into send_sni_for_federation_requests ... # Conflicts: # synapse/http/endpoint.py		2018-07-09 08:51:11 +02:00
..
__init__.py	factor out uri redaction into a method on http	2018-06-05 18:31:40 +01:00
additional_resource.py	Set Server header in SynapseRequest	2018-05-10 18:50:27 +01:00
client.py	Attempt to be more performant on PyPy (#3462)	2018-06-28 14:49:57 +01:00
endpoint.py	Merge branch 'develop' into send_sni_for_federation_requests	2018-07-09 08:51:11 +02:00
matrixfederationclient.py	Merge branch 'develop' into send_sni_for_federation_requests	2018-07-09 08:51:11 +02:00
request_metrics.py	Fix inflight requests metric (incorrect name & traceback) (#3413)	2018-06-20 11:18:57 +01:00
server.py	Attempt to be more performant on PyPy (#3462)	2018-06-28 14:49:57 +01:00
servlet.py	Attempt to be more performant on PyPy (#3462)	2018-06-28 14:49:57 +01:00
site.py	replace invalid utf8 with \ufffd	2018-07-02 11:33:02 +01:00