diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-21 15:48:34 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-21 15:48:34 +0100 |
| commit | 5201c661082cb66e544c968ab3d5d97278509774 (patch) | |
| tree | 1a23e19f9be1c6139fbff4052b416261d6aadcd6 /synapse/handlers/__init__.py | |
| parent | Doc string for the SyncHandler.typing_by_room method (diff) | |
| parent | Merge pull request #316 from matrix-org/markjh/v2_sync_archived (diff) | |
| download | synapse-5201c661082cb66e544c968ab3d5d97278509774.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_typing
Conflicts: synapse/handlers/sync.py
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 8725c3c420..87b4d381c7 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -32,6 +32,7 @@ from .sync import SyncHandler from .auth import AuthHandler from .identity import IdentityHandler from .receipts import ReceiptsHandler +from .search import SearchHandler class Handlers(object): @@ -68,3 +69,4 @@ class Handlers(object): self.sync_handler = SyncHandler(hs) self.auth_handler = AuthHandler(hs) self.identity_handler = IdentityHandler(hs) + self.search_handler = SearchHandler(hs) |