summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-06-27 15:41:34 +0100
committerErik Johnston <erik@matrix.org>2017-06-27 15:41:34 +0100
commit731f3c37a0eec2e25dfbf35b57dc4d6a3a324559 (patch)
tree99d829a2150ad93562f6e30f05631d198ea144fd /synapse/storage
parentMerge pull request #2308 from matrix-org/erikj/user_ip_repl (diff)
parentUpdate version and changelog (diff)
downloadsynapse-731f3c37a0eec2e25dfbf35b57dc4d6a3a324559.tar.xz
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions