diff options
author | Erik Johnston <erik@matrix.org> | 2016-07-28 10:47:06 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-07-28 10:47:06 +0100 |
commit | a2851940219d9a9d230a452ff22ae4e172b421c2 (patch) | |
tree | 45440922d6b10a9ed8f463aa639efb835072a34d /synapse/crypto/keyring.py | |
parent | Bump version and changelog (diff) | |
parent | Cache getPeer (diff) | |
download | synapse-a2851940219d9a9d230a452ff22ae4e172b421c2.tar.xz |
Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions