summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-05-09 15:32:07 +0100
committerErik Johnston <erik@matrix.org>2018-05-09 15:32:07 +0100
commitcddf91c8b942167feb1e1b87e3c3e80dbc7fa02f (patch)
treecda316a97bc6538074c66cb6267ce23f0793ec78 /synapse/http
parentRemove unused code path from member change DB func (diff)
parentMerge pull request #3196 from matrix-org/erikj/pagination_return (diff)
downloadsynapse-cddf91c8b942167feb1e1b87e3c3e80dbc7fa02f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_membership_change
Diffstat (limited to 'synapse/http')
0 files changed, 0 insertions, 0 deletions