Jeroen 505530f36a Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests ... # Conflicts: # synapse/crypto/context_factory.py		2018-07-14 20:24:46 +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
3316.feature	changelog	2018-07-12 10:00:57 +01:00
3463.misc	Add an isort configuration (#3463)	2018-07-09 16:05:21 +10:00
3464.misc	changelog	2018-07-09 16:09:37 +10:00
3496.feature	Attempt to include db threads in cpu usage stats (#3496)	2018-07-10 16:12:36 +01:00
3497.feature	changelog	2018-07-09 18:16:52 +01:00
3498.misc	changelog entry	2018-07-11 03:27:03 +10:00
3499.misc	Make auth & transactions more testable (#3499)	2018-07-14 07:34:49 +10:00
3501.misc	Refactor logcontext resource usage tracking (#3501)	2018-07-10 13:56:07 +01:00
3505.feature	Newsfile	2018-07-10 17:28:31 +01:00
3521.feature	changelog	2018-07-12 11:45:28 +01:00
3533.bugfix	better changelog	2018-07-13 16:47:13 +01:00
3534.misc	add changelog	2018-07-13 22:19:19 +02:00
3535.misc	Fix develop because I broke it :( (#3535)	2018-07-14 09:51:00 +10:00