summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-19 10:50:43 +0100
committerErik Johnston <erik@matrix.org>2015-05-19 10:50:43 +0100
commit5e7883ec194f87eab4f577022e7bad8de4fb0203 (patch)
tree1deb9b8ee772c192f57ae20504c14feed08850e4 /synapse/appservice
parentDo work in parellel when joining a room (diff)
parentSYN-383: Extract the response list from 'server_keys' in the response JSON as... (diff)
downloadsynapse-5e7883ec194f87eab4f577022e7bad8de4fb0203.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions