summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-23 11:31:53 +0000
committerErik Johnston <erik@matrix.org>2016-11-23 11:31:53 +0000
commitb69f76c1069ac4daa570102ab3dac0bf08e8dcc1 (patch)
treeb3b53d30e85bc26946c988ccc478f130b6f1c452 /synapse/server.py
parentComment (diff)
parentMerge pull request #1640 from matrix-org/kegan/sync-perf (diff)
downloadsynapse-b69f76c1069ac4daa570102ab3dac0bf08e8dcc1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_fed_txn
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions