Andrew Morgan f300c08d98 Merge branch 'develop' of github.com:matrix-org/synapse into hawkowl/cache-config-without-synctl ... * 'develop' of github.com:matrix-org/synapse: (76 commits) 1.12.4 Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"" Revert "Merge pull request #7315 from matrix-org/babolivier/request_token" Stop the master relaying USER_SYNC for other workers (#7318) Config option to inhibit 3PID errors on /requestToken Fix replication metrics when using redis (#7325) formatting for the changelog Another go at fixing one-word commands (#7326) 1.12.4rc1 1.12.4rc1 fix changelog name Extend StreamChangeCache to support multiple entities per stream ID (#7303) Extend room admin api with additional attributes (#7225) Add ability to run replication protocol over redis. (#7040) Do not treat display names as globs for push rules. (#7271) Reduce logging verbosity of URL cache cleanup. (#7295) Query missing cross-signing keys on local sig upload (#7289) import urllib.parse when using urllib.parse.quote (#7319) Reduce federation logging on success (#7321) Fix changelog file ...		2020-04-24 15:14:18 +01:00
..
main	Merge branch 'develop' of github.com:matrix-org/synapse into hawkowl/cache-config-without-synctl	2020-04-24 15:14:18 +01:00
state	Merge remote-tracking branch 'origin/develop' into hawkowl/cache-config-without-synctl	2020-02-27 23:18:16 +11:00
__init__.py	Modify check_database to take a connection rather than a cursor	2020-01-09 18:05:50 +00:00