summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-16 11:05:34 +0100
committerErik Johnston <erik@matrix.org>2015-09-16 11:05:34 +0100
commiteb700cdc3886b5a31699fce25e9471c56b946b9d (patch)
treeca642b54b7e2c0cf1c85eb709b3052fc11ef7842 /synapse/crypto/keyring.py
parentMerge pull request #281 from matrix-org/erikj/update_extremeties (diff)
parentMerge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse (diff)
downloadsynapse-eb700cdc3886b5a31699fce25e9471c56b946b9d.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions