diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
| commit | efeeff29f66f14fd4744413a3fd211d01e6c302a (patch) | |
| tree | db5be4d096fdd045623017abffc7b67806c55c32 /synapse/handlers/__init__.py | |
| parent | hacky support for video for FS CC DD (diff) | |
| parent | Change log level to info (diff) | |
| download | synapse-efeeff29f66f14fd4744413a3fd211d01e6c302a.tar.xz | |
Merge branch 'release-v0.10.0' v0.10.0
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 685792dbdc..8725c3c420 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -22,7 +22,6 @@ from .room import ( from .message import MessageHandler from .events import EventStreamHandler, EventHandler from .federation import FederationHandler -from .login import LoginHandler from .profile import ProfileHandler from .presence import PresenceHandler from .directory import DirectoryHandler @@ -32,6 +31,7 @@ from .appservice import ApplicationServicesHandler from .sync import SyncHandler from .auth import AuthHandler from .identity import IdentityHandler +from .receipts import ReceiptsHandler class Handlers(object): @@ -53,10 +53,10 @@ class Handlers(object): self.profile_handler = ProfileHandler(hs) self.presence_handler = PresenceHandler(hs) self.room_list_handler = RoomListHandler(hs) - self.login_handler = LoginHandler(hs) self.directory_handler = DirectoryHandler(hs) self.typing_notification_handler = TypingNotificationHandler(hs) self.admin_handler = AdminHandler(hs) + self.receipts_handler = ReceiptsHandler(hs) asapi = ApplicationServiceApi(hs) self.appservice_handler = ApplicationServicesHandler( hs, asapi, AppServiceScheduler( |