summary refs log tree commit diff
path: root/synapse/config/voip.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-24 22:31:25 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-10-24 22:31:25 -0400
commitc40d7244f8e07538a7ab25c255e803bc54fb7cb3 (patch)
treea502c6063ce25bb2ddaa479a7ce64d705e52b261 /synapse/config/voip.py
parentdon't error if federation query doesn't have cross-signing keys (diff)
parentMerge pull request #6248 from matrix-org/erikj/move_schema_files (diff)
downloadsynapse-c40d7244f8e07538a7ab25c255e803bc54fb7cb3.tar.xz
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/config/voip.py')
-rw-r--r--synapse/config/voip.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/voip.py b/synapse/config/voip.py
index a68a3068aa..b313bff140 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -56,5 +56,5 @@ class VoipConfig(Config):
         # connect to arbitrary endpoints without having first signed up for a
         # valid account (e.g. by passing a CAPTCHA).
         #
-        #turn_allow_guests: True
+        #turn_allow_guests: true
         """