summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-16 10:50:24 +0100
committerErik Johnston <erik@matrix.org>2016-08-16 10:50:24 +0100
commit6cbd1b495ea42b0ae6dcda34652bed75804a2eea (patch)
tree86de8b0cf6ce89fb17041c2ddbfcfde406bee4c2 /synapse/crypto/keyring.py
parentMerge pull request #1009 from matrix-org/erikj/event_split (diff)
parentAdd missing database corruption recovery case (diff)
downloadsynapse-6cbd1b495ea42b0ae6dcda34652bed75804a2eea.tar.xz
Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into Ralith-fix_integrity_retry
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions