diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-17 11:19:55 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-01-17 11:19:55 +0000 |
| commit | 90c14da9923ebabef87d9a7b5ba44d4fddc65114 (patch) | |
| tree | e1853f424fd566c828582ecac69467692711783e /synapse/config/tls.py | |
| parent | Track db txn time in millisecs (diff) | |
| parent | Merge pull request #2792 from matrix-org/rav/optimise_logging_context (diff) | |
| download | synapse-90c14da9923ebabef87d9a7b5ba44d4fddc65114.tar.xz | |
Merge branch 'develop' into rav/db_txn_time_in_millis
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 |