diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-29 15:59:05 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-29 15:59:05 +0100 |
commit | f1bdf40dda5eaba622103b64e749b539e5ce6bf1 (patch) | |
tree | a2a09ff016223528aafa4ce50c9b12698e44c6b1 /synapse/handlers/__init__.py | |
parent | No longer need the Freenode verification key file (diff) | |
parent | Unbreak tests after changing storage API (diff) | |
download | synapse-f1bdf40dda5eaba622103b64e749b539e5ce6bf1.tar.xz |
Merge branch 'whois' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/__init__.py')
-rw-r--r-- | synapse/handlers/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 5308e2c8e1..d5df3c630b 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -25,6 +25,7 @@ from .profile import ProfileHandler from .presence import PresenceHandler from .directory import DirectoryHandler from .typing import TypingNotificationHandler +from .admin import AdminHandler class Handlers(object): @@ -49,3 +50,4 @@ class Handlers(object): self.login_handler = LoginHandler(hs) self.directory_handler = DirectoryHandler(hs) self.typing_notification_handler = TypingNotificationHandler(hs) + self.admin_handler = AdminHandler(hs) |