diff options
author | Matthew Hodgson <matthew@arasphere.net> | 2018-07-23 10:03:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-23 10:03:28 +0100 |
commit | 9b34f3ea3af233d70412565290468092cf3c5984 (patch) | |
tree | dcfc00333a843cdc3a011249ef78f8438804dbd4 /synapse/config/voip.py | |
parent | add trailing comma (diff) | |
parent | Make the rest of the .iterwhatever go away (#3562) (diff) | |
download | synapse-9b34f3ea3af233d70412565290468092cf3c5984.tar.xz |
Merge branch 'develop' into matthew/sync_deleted_devices
Diffstat (limited to 'synapse/config/voip.py')
-rw-r--r-- | synapse/config/voip.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/voip.py b/synapse/config/voip.py index 3a4e16fa96..d07bd24ffd 100644 --- a/synapse/config/voip.py +++ b/synapse/config/voip.py @@ -30,10 +30,10 @@ class VoipConfig(Config): ## Turn ## # The public URIs of the TURN server to give to clients - turn_uris: [] + #turn_uris: [] # The shared secret used to compute passwords for the TURN server - turn_shared_secret: "YOUR_SHARED_SECRET" + #turn_shared_secret: "YOUR_SHARED_SECRET" # The Username and password if the TURN server needs them and # does not use a token |