diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-02-27 13:47:44 -0500 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-02-27 13:47:44 -0500 |
commit | ab0073a6c0f454d0fa43d7a57a7442442eeb46fe (patch) | |
tree | 21ea036640633bda2a0f7ecb42148c2f446c8e2a /synapse/crypto/keyring.py | |
parent | Don't refuse to start worker if media listener configured. (#7002) (diff) | |
parent | Cast a coroutine into a Deferred in the federation base (#6996) (diff) | |
download | synapse-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