diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
commit | ef9c4476a0eb653637040f86dd900252cad30567 (patch) | |
tree | ad14ecbbb2a03ceb47f8fba558994edd3d71b9df /synapse/config/voip.py | |
parent | Fix SQL so that accepts we may want to persist events twice. (diff) | |
parent | SYWEB-12: Add a 'Room Info' button which displays all state content. (diff) | |
download | synapse-ef9c4476a0eb653637040f86dd900252cad30567.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'synapse/config/voip.py')
-rw-r--r-- | synapse/config/voip.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/voip.py b/synapse/config/voip.py index 3a51664f46..06675966ce 100644 --- a/synapse/config/voip.py +++ b/synapse/config/voip.py @@ -33,7 +33,10 @@ class VoipConfig(Config): ) group.add_argument( "--turn-shared-secret", type=str, default=None, - help="The shared secret used to compute passwords for the TURN server" + help=( + "The shared secret used to compute passwords for the TURN" + " server" + ) ) group.add_argument( "--turn-user-lifetime", type=int, default=(1000 * 60 * 60), |