summary refs log tree commit diff
path: root/synapse/handlers/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-31 14:45:57 +0100
committerErik Johnston <erik@matrix.org>2016-03-31 14:45:57 +0100
commitfe959433051c5237735bc659f4c59bd67a36538b (patch)
tree8f1d33eec546d94ad0a7526921051c9132e2fb7b /synapse/handlers/__init__.py
parentMerge pull request #676 from matrix-org/markjh/replicate_stateIII (diff)
parentSplit out RoomMemberHandler (diff)
downloadsynapse-fe959433051c5237735bc659f4c59bd67a36538b.tar.xz
Merge pull request #679 from matrix-org/erikj/member
Split out RoomMemberHandler
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 66d2c01123..f4dbf47c1d 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -17,8 +17,9 @@ from synapse.appservice.scheduler import AppServiceScheduler
 from synapse.appservice.api import ApplicationServiceApi
 from .register import RegistrationHandler
 from .room import (
-    RoomCreationHandler, RoomMemberHandler, RoomListHandler, RoomContextHandler,
+    RoomCreationHandler, RoomListHandler, RoomContextHandler,
 )
+from .room_member import RoomMemberHandler
 from .message import MessageHandler
 from .events import EventStreamHandler, EventHandler
 from .federation import FederationHandler