diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
| commit | 425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch) | |
| tree | 7bdebcc130261183a7d3864f56857e7006df3454 /synapse/handlers/__init__.py | |
| parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
| parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
| download | synapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz | |
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index f4dbf47c1d..60e31b68ff 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -24,7 +24,6 @@ from .message import MessageHandler from .events import EventStreamHandler, EventHandler from .federation import FederationHandler from .profile import ProfileHandler -from .presence import PresenceHandler from .directory import DirectoryHandler from .typing import TypingNotificationHandler from .admin import AdminHandler @@ -53,7 +52,6 @@ class Handlers(object): self.event_handler = EventHandler(hs) self.federation_handler = FederationHandler(hs) self.profile_handler = ProfileHandler(hs) - self.presence_handler = PresenceHandler(hs) self.room_list_handler = RoomListHandler(hs) self.directory_handler = DirectoryHandler(hs) self.typing_notification_handler = TypingNotificationHandler(hs) |