summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-01 16:48:53 +0000
committerErik Johnston <erik@matrix.org>2016-11-01 16:48:53 +0000
commitdc155f4c2c22661894c54d29d2d4193dc1454b43 (patch)
treee95a86b87e1f6bd5db0cca7e2d04a8b5c87bbc84 /synapse/http
parentMerge pull request #1188 from matrix-org/erikj/sent_transactions (diff)
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff)
downloadsynapse-dc155f4c2c22661894c54d29d2d4193dc1454b43.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/http')
0 files changed, 0 insertions, 0 deletions