summary refs log tree commit diff
path: root/synapse/crypto/keyserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-06 14:10:53 +0100
committerErik Johnston <erik@matrix.org>2019-09-06 14:10:53 +0100
commit9240622c1aaee18211f63db7c907aba99b885bb9 (patch)
tree8b851016b2a204a53fe2136edfad02bdb9e78e7e /synapse/crypto/keyserver.py
parentMerge branch 'anoa/worker_store_reg' of github.com:matrix-org/synapse into ma... (diff)
parentMerge pull request #5993 from matrix-org/anoa/worker_store_reg (diff)
downloadsynapse-9240622c1aaee18211f63db7c907aba99b885bb9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/crypto/keyserver.py')
0 files changed, 0 insertions, 0 deletions