diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-03 22:40:28 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-03 22:40:28 +0000 |
| commit | bb9f0f3cdb57882248b6426dd4ec5bd5781daaef (patch) | |
| tree | 41a8ee0b215406119ec5ef44cf0a3326a8ae1636 /synapse/config/tls.py | |
| parent | oops (diff) | |
| parent | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media (diff) | |
| download | synapse-bb9f0f3cdb57882248b6426dd4ec5bd5781daaef.tar.xz | |
Merge branch 'develop' into matthew/gin_work_mem
Diffstat (limited to 'synapse/config/tls.py')
| -rw-r--r-- | synapse/config/tls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 4748f71c2f..29eb012ddb 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -96,7 +96,7 @@ class TlsConfig(Config): # certificates returned by this server match one of the fingerprints. # # Synapse automatically adds the fingerprint of its own certificate - # to the list. So if federation traffic is handle directly by synapse + # to the list. So if federation traffic is handled directly by synapse # then no modification to the list is required. # # If synapse is run behind a load balancer that handles the TLS then it |