diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-06 14:10:53 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-09-06 14:10:53 +0100 |
commit | 9240622c1aaee18211f63db7c907aba99b885bb9 (patch) | |
tree | 8b851016b2a204a53fe2136edfad02bdb9e78e7e /synapse/crypto/keyserver.py | |
parent | Merge branch 'anoa/worker_store_reg' of github.com:matrix-org/synapse into ma... (diff) | |
parent | Merge pull request #5993 from matrix-org/anoa/worker_store_reg (diff) | |
download | synapse-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