diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
| commit | 697f6714a4c65cec6019231a7bac84e1b544c42d (patch) | |
| tree | 8693ec59f906c076abb534f01c32573619bf7c8c /synapse/rest/__init__.py | |
| parent | Bump versions and changelog (diff) | |
| parent | Just use a yaml list for turn servers (diff) | |
| download | synapse-697f6714a4c65cec6019231a7bac84e1b544c42d.tar.xz | |
Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4
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) |