diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-06-17 10:58:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-17 10:58:52 +0100 |
commit | f1073ad43d04dfbdc12474a4d4ccc1be3617fa77 (patch) | |
tree | d519760f3b97d578c741d5062223189157285a99 /synapse/federation | |
parent | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode (diff) | |
parent | Use worker_ prefixes for worker config, use existing support for multiple con... (diff) | |
download | synapse-f1073ad43d04dfbdc12474a4d4ccc1be3617fa77.tar.xz |
Merge pull request #874 from matrix-org/markjh/worker_config
Inline the synchrotron and pusher configs into the main config
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions