diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-17 10:57:13 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-01-17 10:57:13 +0000 |
| commit | 38506773ebfe4d3afefcb835eb891f13c943f8fa (patch) | |
| tree | b7432d12406c90f67309ca96495da7d767bc47ec /synapse/config | |
| parent | Optimise LoggingContext creation and copying (diff) | |
| parent | Merge pull request #2789 from matrix-org/erikj/fix_thumbnails (diff) | |
| download | synapse-38506773ebfe4d3afefcb835eb891f13c943f8fa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_context
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 |