diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-03-24 12:45:54 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-03-24 12:45:54 +0000 |
| commit | ea74189a903aec2437de31863d1bb3205f66995f (patch) | |
| tree | ae56d5c6cc91cff675e0842b34da12abb0fa6a31 /synapse/crypto/keyring.py | |
| parent | Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#... (diff) | |
| parent | Spaces summary: call out to other servers (#9653) (diff) | |
| download | synapse-ea74189a903aec2437de31863d1bb3205f66995f.tar.xz | |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py |