summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-21 13:46:27 +0000
committerErik Johnston <erik@matrix.org>2017-02-21 13:46:27 +0000
commita3708a18851376ddeedd639cefa7e92648fd8177 (patch)
treef1fbca2d4a7bc5704c1fbb136da0aec0162e3d65 /synapse/storage
parentMerge pull request #1930 from matrix-org/rav/fix_txnq_race (diff)
parentMerge branch 'release-v0.19.2' of github.com:matrix-org/synapse (diff)
downloadsynapse-a3708a18851376ddeedd639cefa7e92648fd8177.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions