diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
commit | b63691f6e205b4e2d2a990ff04318e4daf731e2c (patch) | |
tree | aa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse/config/voip.py | |
parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
parent | Bump version numbers and change log (diff) | |
download | synapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz |
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
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), |