diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
commit | f73ea0bda26a51794abedb65cbf4d0a717dee26c (patch) | |
tree | 64fd41675594a7c71a7f119fb68b5b476f9173fd /synapse/rest/client/v1/voip.py | |
parent | Only fire user_joined_room on the distributor if the user has actually joined... (diff) | |
parent | Merge pull request #392 from matrix-org/markjh/client_config (diff) | |
download | synapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'synapse/rest/client/v1/voip.py')
-rw-r--r-- | synapse/rest/client/v1/voip.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py index eb7c57cade..1567a03c89 100644 --- a/synapse/rest/client/v1/voip.py +++ b/synapse/rest/client/v1/voip.py @@ -15,7 +15,7 @@ from twisted.internet import defer -from base import ClientV1RestServlet, client_path_pattern +from base import ClientV1RestServlet, client_path_patterns import hmac @@ -24,7 +24,7 @@ import base64 class VoipRestServlet(ClientV1RestServlet): - PATTERN = client_path_pattern("/voip/turnServer$") + PATTERNS = client_path_patterns("/voip/turnServer$") @defer.inlineCallbacks def on_GET(self, request): |