diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-19 10:50:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-19 10:50:43 +0100 |
commit | 5e7883ec194f87eab4f577022e7bad8de4fb0203 (patch) | |
tree | 1deb9b8ee772c192f57ae20504c14feed08850e4 /synapse/config | |
parent | Do work in parellel when joining a room (diff) | |
parent | SYN-383: Extract the response list from 'server_keys' in the response JSON as... (diff) | |
download | synapse-5e7883ec194f87eab4f577022e7bad8de4fb0203.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions