diff options
author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/config/tls.py | |
parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
parent | Revert "Support registration & login with phone number" (diff) | |
download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
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 3c58d2de17..e081840a83 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -95,7 +95,7 @@ class TlsConfig(Config): # make HTTPS requests to this server will check that the TLS # certificates returned by this server match one of the fingerprints. # - # Synapse automatically adds its the fingerprint of its own certificate + # Synapse automatically adds the fingerprint of its own certificate # to the list. So if federation traffic is handle directly by synapse # then no modification to the list is required. # |