diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-11 21:34:19 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-11 21:34:19 +0000 |
| commit | 15272f837c42e003ade116ca0f1c239a29ebfb93 (patch) | |
| tree | 20aeb74d19c8713e557f592004a3fefba34ee8d5 /.circleci/merge_base_branch.sh | |
| parent | Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/work (diff) | |
| parent | Don't create server contexts when TLS is disabled (diff) | |
| download | synapse-15272f837c42e003ade116ca0f1c239a29ebfb93.tar.xz | |
Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/work
Diffstat (limited to '.circleci/merge_base_branch.sh')
0 files changed, 0 insertions, 0 deletions