summary refs log tree commit diff
path: root/synapse/handlers/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-28 18:26:01 +0000
committerErik Johnston <erik@matrix.org>2015-10-28 18:26:01 +0000
commite83c4b8e3eee62fad2a303dd86de36bc8afa9e29 (patch)
treeb9530353090b8155c8a208bc489c4106c3110ed8 /synapse/handlers/__init__.py
parentMerge pull request #332 from matrix-org/rav/full_state_sync (diff)
parentDocs (diff)
downloadsynapse-e83c4b8e3eee62fad2a303dd86de36bc8afa9e29.tar.xz
Merge pull request #334 from matrix-org/erikj/context_api
Add room context api
Diffstat (limited to 'synapse/handlers/__init__.py')
-rw-r--r--synapse/handlers/__init__.py3
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)