summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-02-27 13:47:44 -0500
committerPatrick Cloke <patrickc@matrix.org>2020-02-27 13:47:44 -0500
commitab0073a6c0f454d0fa43d7a57a7442442eeb46fe (patch)
tree21ea036640633bda2a0f7ecb42148c2f446c8e2a /synapse/crypto/keyring.py
parentDon't refuse to start worker if media listener configured. (#7002) (diff)
parentCast a coroutine into a Deferred in the federation base (#6996) (diff)
downloadsynapse-ab0073a6c0f454d0fa43d7a57a7442442eeb46fe.tar.xz
Merge remote-tracking branch 'origin/release-v1.11.1' into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions