summary refs log tree commit diff
path: root/synapse/config/voip.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-02 13:53:30 +0000
committerErik Johnston <erik@matrix.org>2015-03-02 13:53:30 +0000
commit0a036944bd2f0b42195b1984ff0ad2b6ff3d50f3 (patch)
tree25ca81b14a72192a89c9399b3d80180ac124ca14 /synapse/config/voip.py
parentMust update pending_transactions map before yield'ing (diff)
parentMerge pull request #83 from matrix-org/nofile_limit_config (diff)
downloadsynapse-0a036944bd2f0b42195b1984ff0ad2b6ff3d50f3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
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 a2b822719f..65162d21b7 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -28,7 +28,7 @@ class VoipConfig(Config):
         super(VoipConfig, cls).add_arguments(parser)
         group = parser.add_argument_group("voip")
         group.add_argument(
-            "--turn-uris", type=str, default=None,
+            "--turn-uris", type=str, default=None, action='append',
             help="The public URIs of the TURN server to give to clients"
         )
         group.add_argument(