summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-10-28 11:12:31 +0100
committerMark Haines <mark.haines@matrix.org>2016-10-28 11:12:31 +0100
commit490b97d3e7c89981085fcc700c6e776a7d913ac7 (patch)
treeb4282c1b24da3a1c5ef416ff77f65c39798c73b2 /synapse/http
parentBump changelog and version (diff)
parentMerge pull request #1184 from matrix-org/paul/metrics (diff)
downloadsynapse-490b97d3e7c89981085fcc700c6e776a7d913ac7.tar.xz
Merge branch 'develop' into release-v0.18.2
Diffstat (limited to 'synapse/http')
0 files changed, 0 insertions, 0 deletions