summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-09-26 10:08:59 +0100
committerErik Johnston <erik@matrix.org>2017-09-26 10:08:59 +0100
commit1a398b19fd3ca6cb0e0bf22011407404cd327c72 (patch)
tree3404f5893e9085a5cbe3e248b370efd099fc260e /synapse/config
parentBump changelog and version (diff)
parentMerge pull request #2470 from matrix-org/erikj/sync_speed_fix (diff)
downloadsynapse-1a398b19fd3ca6cb0e0bf22011407404cd327c72.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions