diff options
author | Erik Johnston <erik@matrix.org> | 2021-05-28 17:15:01 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-05-28 17:15:01 +0100 |
commit | a027b65c8ed7e63118829ac63edbabcecd1ac758 (patch) | |
tree | 101c6440e0b0597b39f5eb107a739198bd55aa95 /synapse/crypto/keyring.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | CHANGELOG (diff) | |
download | synapse-a027b65c8ed7e63118829ac63edbabcecd1ac758.tar.xz |
Merge remote-tracking branch 'origin/release-v1.35' into matrix-org-hotfixes v1.35.0rc3
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions