diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
| commit | a28d0667329a65b6c187a85befd4f95f89a550b0 (patch) | |
| tree | e8b44087781b8707c458f9b886effd09f5ad9990 /synapse/handlers/__init__.py | |
| parent | Tests (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-a28d0667329a65b6c187a85befd4f95f89a550b0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache
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 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 |