diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-04-04 00:38:21 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-04-04 00:38:21 +0100 |
| commit | 9f7dc2bef7cd39645ae74d96f2919a3f9fdb65ac (patch) | |
| tree | b818eb0b962de7e860584bb5286f98e60e12ac75 /synapse/handlers/__init__.py | |
| parent | report image size (bytewise) in OG meta (diff) | |
| parent | Merge pull request #686 from matrix-org/markjh/doc_strings (diff) | |
| download | synapse-9f7dc2bef7cd39645ae74d96f2919a3f9fdb65ac.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
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 |