summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-24 13:22:02 +0100
committerErik Johnston <erik@matrix.org>2016-08-24 13:22:02 +0100
commitfda97dd58ac41f2faf7561f43009f970a14afa42 (patch)
treede0f7aba18070b4c0e34b3b0e445d69e96b012bd /synapse/app
parentPreserve some logcontexts (diff)
parentMerge pull request #1040 from matrix-org/erikj/pagination (diff)
downloadsynapse-fda97dd58ac41f2faf7561f43009f970a14afa42.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_log_contexts
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions