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	copyrights	2016-01-07 04:26:29 +00:00
context_factory.py	take idna implementation from twisted	2018-06-26 21:15:14 +02:00
event_signing.py	Fix 500 when joining matrix-dev	2017-11-29 16:00:46 +00:00
keyclient.py	Merge branch 'develop' into send_sni_for_federation_requests	2018-07-09 08:51:11 +02:00
keyring.py	send SNI for federation requests	2018-06-24 22:38:43 +02:00