diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-05 22:54:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-05 22:54:41 +0100 |
commit | a39be79216153421be91a68b40d924ee40bd582d (patch) | |
tree | b7b8f4ce7048ff11393031a5069ccf6d14ef6f91 | |
parent | Neilj/add r0.5 to versions (#5360) (diff) | |
parent | Fix `federation_custom_ca_list` configuration option. (diff) | |
download | synapse-a39be79216153421be91a68b40d924ee40bd582d.tar.xz |
Merge pull request #5362 from matrix-org/rav/fix_custom_ca
Fix `federation_custom_ca_list` configuration option.
-rw-r--r-- | changelog.d/5362.bugfix | 1 | ||||
-rw-r--r-- | synapse/config/tls.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/5362.bugfix b/changelog.d/5362.bugfix new file mode 100644 |