diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-04-20 16:24:21 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-04-20 16:24:21 +0100 |
commit | db8d4e8dd686300adee10ab7bf23b0af7ab3bad5 (patch) | |
tree | cfb96f8d15d411ac702208a320b0777456532186 /synapse/crypto/keyring.py | |
parent | Implement v2 key lookup (diff) | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-db8d4e8dd686300adee10ab7bf23b0af7ab3bad5.tar.xz |
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions