diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-25 13:09:56 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-25 13:09:56 +0100 |
| commit | c58eb0d5a3ed9c4eac3b7af9d78a9ed1ae6da9fe (patch) | |
| tree | 85a1e05e91b0601e944295f7828af0b6e2cce814 /synapse/rest/__init__.py | |
| parent | Fix test where we changed arguments used to call the notifier (diff) | |
| parent | Add stun server fallback and I-told-you-so message if we get no TURN server a... (diff) | |
| download | synapse-c58eb0d5a3ed9c4eac3b7af9d78a9ed1ae6da9fe.tar.xz | |
Merge branch 'turn' into develop
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index ed785cfbd5..3b9aa59733 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -15,7 +15,7 @@ from . import ( - room, events, register, login, profile, presence, initial_sync, directory + room, events, register, login, profile, presence, initial_sync, directory, voip ) @@ -42,3 +42,4 @@ class RestServletFactory(object): presence.register_servlets(hs, client_resource) initial_sync.register_servlets(hs, client_resource) directory.register_servlets(hs, client_resource) + voip.register_servlets(hs, client_resource) |