diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
| commit | 0e367563838de76972bac1fd7bc3ab3943b9a57e (patch) | |
| tree | f3de1ae204fa232033d8951c31a45a71a797d94c /synapse/handlers/__init__.py | |
| parent | Support clients supplying older tokens, fix short poll test (diff) | |
| parent | Merge pull request #337 from matrix-org/markjh/v2_sync_joining (diff) | |
| download | synapse-0e367563838de76972bac1fd7bc3ab3943b9a57e.tar.xz | |
Merge branch 'develop' into markjh/room_tags
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) |