diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
| commit | 2f6ad79a80a167b094e4ecd1894bae9b1cd15675 (patch) | |
| tree | ea04c29e90a9335f6a4bfa199e9f4b4adfdc9ded /synapse/handlers/__init__.py | |
| parent | Pull out sender when computing search results (diff) | |
| parent | Docs (diff) | |
| download | synapse-2f6ad79a80a167b094e4ecd1894bae9b1cd15675.tar.xz | |
Merge branch 'erikj/context_api' into erikj/search
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 87b4d381c7..6a2339f2eb 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -17,7 +17,7 @@ from synapse.appservice.scheduler import AppServiceScheduler from synapse.appservice.api import ApplicationServiceApi from .register import RegistrationHandler from .room import ( - RoomCreationHandler, RoomMemberHandler, RoomListHandler + RoomCreationHandler, RoomMemberHandler, RoomListHandler, RoomContextHandler, ) from .message import MessageHandler from .events import EventStreamHandler, EventHandler @@ -70,3 +70,4 @@ class Handlers(object): self.auth_handler = AuthHandler(hs) self.identity_handler = IdentityHandler(hs) self.search_handler = SearchHandler(hs) + self.room_context_handler = RoomContextHandler(hs) |