mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-02 14:56:09 -04:00
Merge branch 'develop' into application-services
Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
This commit is contained in:
commit
c059c9fea5
77 changed files with 6367 additions and 1536 deletions
|
@ -27,6 +27,7 @@ from .directory import DirectoryHandler
|
|||
from .typing import TypingNotificationHandler
|
||||
from .admin import AdminHandler
|
||||
from .appservice import ApplicationServicesHandler
|
||||
from .sync import SyncHandler
|
||||
|
||||
|
||||
class Handlers(object):
|
||||
|
@ -53,3 +54,4 @@ class Handlers(object):
|
|||
self.typing_notification_handler = TypingNotificationHandler(hs)
|
||||
self.admin_handler = AdminHandler(hs)
|
||||
self.appservice_handler = ApplicationServicesHandler(hs)
|
||||
self.sync_handler = SyncHandler(hs)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue