summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-05-22 15:56:55 +0100
committerNeil Johnson <neil@matrix.org>2019-05-22 15:56:55 +0100
commitae5521be9cb9305501dde4670adc8afac67fa83c (patch)
tree6ee2474cfee583140c9d242916d0ddf11ab3f107 /synapse/crypto/keyring.py
parentNeilj/ensure get profileinfo available in client reader slaved store (#5213) (diff)
parent0.99.5 (diff)
downloadsynapse-ae5521be9cb9305501dde4670adc8afac67fa83c.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions