summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 14:54:52 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 14:54:52 +0100
commitebfdd2eb5bd9c27ec25b365c544a458b4e92f157 (patch)
tree1a6d7abe69139aa3864af6ccbd0689c494c278b7 /synapse/http
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff)
parentMerge pull request #155 from matrix-org/erikj/perf (diff)
downloadsynapse-ebfdd2eb5bd9c27ec25b365c544a458b4e92f157.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/http')
0 files changed, 0 insertions, 0 deletions