diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
| commit | c02da58a9da5c617c80fbeb7205f163e7b410c6f (patch) | |
| tree | 8b166570eb2cbbecb7640d92d072f31add922535 /synapse/handlers/__init__.py | |
| parent | Consume errors in time_bound_deferred (diff) | |
| parent | Merge pull request #74 from matrix-org/federation_min_depth_fix (diff) | |
| download | synapse-c02da58a9da5c617c80fbeb7205f163e7b410c6f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index a32eab9316..8d345bf936 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +from synapse.appservice.api import ApplicationServiceApi from .register import RegistrationHandler from .room import ( RoomCreationHandler, RoomMemberHandler, RoomListHandler @@ -26,6 +27,7 @@ from .presence import PresenceHandler from .directory import DirectoryHandler from .typing import TypingNotificationHandler from .admin import AdminHandler +from .appservice import ApplicationServicesHandler from .sync import SyncHandler @@ -52,4 +54,7 @@ class Handlers(object): self.directory_handler = DirectoryHandler(hs) self.typing_notification_handler = TypingNotificationHandler(hs) self.admin_handler = AdminHandler(hs) + self.appservice_handler = ApplicationServicesHandler( + hs, ApplicationServiceApi(hs) + ) self.sync_handler = SyncHandler(hs) |