diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
| commit | c059c9fea5e3ef36cadc136e055284953556c4ed (patch) | |
| tree | 39faa451578ceecc16c92c390a564ebec4fc2373 /synapse/rest/client/v1/voip.py | |
| parent | Add basic application_services SQL, and hook up parts of the appservice store... (diff) | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| download | synapse-c059c9fea5e3ef36cadc136e055284953556c4ed.tar.xz | |
Merge branch 'develop' into application-services
Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/rest/client/v1/voip.py')
| -rw-r--r-- | synapse/rest/client/v1/voip.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py index 822d863ce6..11d08fbced 100644 --- a/synapse/rest/client/v1/voip.py +++ b/synapse/rest/client/v1/voip.py @@ -28,7 +28,7 @@ class VoipRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request): - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) turnUris = self.hs.config.turn_uris turnSecret = self.hs.config.turn_shared_secret |