diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-15 14:44:32 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-15 14:44:32 -0600 |
| commit | f293d124b6494baba71c14591a265af551214d1c (patch) | |
| tree | c2eabdc7431cd56f7a598e1915aa91da4f3f03b3 /synapse/server.py | |
| parent | Update login terms structure for the proposed language support (diff) | |
| parent | Merge pull request #4019 from matrix-org/dbkr/e2e_backups (diff) | |
| download | synapse-f293d124b6494baba71c14591a265af551214d1c.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index 938a05f9dc..3e9d3d8256 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -51,6 +51,7 @@ from synapse.handlers.deactivate_account import DeactivateAccountHandler from synapse.handlers.device import DeviceHandler from synapse.handlers.devicemessage import DeviceMessageHandler from synapse.handlers.e2e_keys import E2eKeysHandler +from synapse.handlers.e2e_room_keys import E2eRoomKeysHandler from synapse.handlers.events import EventHandler, EventStreamHandler from synapse.handlers.groups_local import GroupsLocalHandler from synapse.handlers.initial_sync import InitialSyncHandler @@ -130,6 +131,7 @@ class HomeServer(object): 'auth_handler', 'device_handler', 'e2e_keys_handler', + 'e2e_room_keys_handler', 'event_handler', 'event_stream_handler', 'initial_sync_handler', @@ -299,6 +301,9 @@ class HomeServer(object): def build_e2e_keys_handler(self): return E2eKeysHandler(self) + def build_e2e_room_keys_handler(self): + return E2eRoomKeysHandler(self) + def build_application_service_api(self): return ApplicationServiceApi(self) |