summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-13 17:07:54 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-13 17:07:54 +0100
commit154b44c2498f021c045d98635b22ce3f706592da (patch)
tree791cf9baf7b7d1f100413ec608d9051ce6b44d38 /synapse/crypto/keyring.py
parentMerge pull request #3099 from matrix-org/matthew/fix-federation-domain-whitelist (diff)
parentMerge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff)
downloadsynapse-154b44c2498f021c045d98635b22ce3f706592da.tar.xz
Merge branch 'master' of https://github.com/matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions