diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-17 11:24:38 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-01-17 11:24:38 +0000 |
| commit | 0486a7814ab264127eda22752cc09ce8252649d3 (patch) | |
| tree | 12a485de0060719cff93226fc368c233bdd6bce9 /synapse/config | |
| parent | rework runInteraction in terms of runConnection (diff) | |
| parent | Merge pull request #2792 from matrix-org/rav/optimise_logging_context (diff) | |
| download | synapse-0486a7814ab264127eda22752cc09ce8252649d3.tar.xz | |
Merge branch 'develop' into rav/rework_run_interaction
Diffstat (limited to 'synapse/config')
| -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 |