Jeroen b5e157d895 Merge branch 'develop' into send_sni_for_federation_requests ... # Conflicts: # synapse/http/endpoint.py		2018-07-09 08:51:11 +02:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
1491.feature	towncrier changelog	2018-06-26 21:10:45 +02:00
3463.misc	Add an isort configuration (#3463)	2018-07-09 16:05:21 +10:00