Jeroen b5e157d895 Merge branch 'develop' into send_sni_for_federation_requests
# Conflicts:
#	synapse/http/endpoint.py
2018-07-09 08:51:11 +02:00
..
2018-06-28 21:14:16 +01:00
2018-04-16 00:39:32 +02:00
2017-01-17 13:22:19 +00:00
2018-07-04 19:06:20 +01:00
2018-04-11 14:37:11 +01:00
2018-07-04 18:59:51 +01:00
2018-05-29 20:19:29 +01:00
2018-05-21 19:47:37 -05:00
2018-05-29 02:23:11 +01:00
2018-06-14 14:20:53 +01:00
2018-06-27 11:38:14 +01:00
2018-06-14 14:21:29 +01:00
2017-10-21 00:30:39 +01:00
2018-06-27 11:38:03 +01:00
2018-06-24 22:38:43 +02:00