diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:42 +0100 |
| commit | 7a8307fe7c3f6b13c78681f1eb320149238828ca (patch) | |
| tree | 8693ec59f906c076abb534f01c32573619bf7c8c /synapse | |
| parent | Add realm to coturn options (it needs it). (diff) | |
| parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
| download | synapse-7a8307fe7c3f6b13c78681f1eb320149238828ca.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/config/voip.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index bba551b2c4..a340a5db66 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.3.3" +__version__ = "0.3.4" diff --git a/synapse/config/voip.py b/synapse/config/voip.py index c5131d9bcd..3a51664f46 100644 --- a/synapse/config/voip.py +++ b/synapse/config/voip.py @@ -19,7 +19,7 @@ class VoipConfig(Config): def __init__(self, args): super(VoipConfig, self).__init__(args) - self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None + self.turn_uris = args.turn_uris self.turn_shared_secret = args.turn_shared_secret self.turn_user_lifetime = args.turn_user_lifetime |