Andrew Morgan 546c23e496 Merge branch 'develop' of github.com:matrix-org/synapse into hawkowl/cache-config-without-synctl ... * 'develop' of github.com:matrix-org/synapse: (199 commits) Extend web_client_location to handle absolute URLs (#7006) Add some benchmarks for LruCache (#6446) Convert http.HTTPStatus objects to their int equivalent (#7188) Reduce the number of calls to `resource.getrusage` (#7183) Remove some `run_in_background` calls in replication code (#7203) Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback"" Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)"" Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback" Revert "Improve the UX of the login fallback when using SSO (#7152)" tweak changelog 1.12.3 Update docstring per review comments Fix device list update stream ids going backward (#7158) Fix the debian build in a better way. (#7212) Fix changelog wording 1.12.2 Pin Pillow>=4.3.0,<7.1.0 to fix dep issue 1.12.1 review comment 1.12.1 ...		2020-04-03 17:13:16 +01:00
..
main	Merge branch 'develop' of github.com:matrix-org/synapse into hawkowl/cache-config-without-synctl	2020-04-03 17:13:16 +01:00
state	…
__init__.py	…