diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-02-26 13:22:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 13:22:06 +0000 |
| commit | c0b6955e3b6d4ee40333b68f35a6cf96925c342a (patch) | |
| tree | 0e810f5eddc0ea1fe93059a6a7d5104d11530b09 /synapse/server.pyi | |
| parent | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate (diff) | |
| parent | Revert "Prevent showing non-fed rooms in fed /publicRooms" (diff) | |
| download | synapse-c0b6955e3b6d4ee40333b68f35a6cf96925c342a.tar.xz | |
Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate
Revert "Prevent showing non-fed rooms in fed /publicRooms"
Diffstat (limited to 'synapse/server.pyi')
| -rw-r--r-- | synapse/server.pyi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server.pyi b/synapse/server.pyi index fb8df56cd5..06cd083a74 100644 --- a/synapse/server.pyi +++ b/synapse/server.pyi @@ -7,9 +7,9 @@ import synapse.handlers.auth import synapse.handlers.deactivate_account import synapse.handlers.device import synapse.handlers.e2e_keys -import synapse.handlers.message import synapse.handlers.room import synapse.handlers.room_member +import synapse.handlers.message import synapse.handlers.set_password import synapse.rest.media.v1.media_repository import synapse.server_notices.server_notices_manager |