summary refs log tree commit diff
path: root/synapse/server.pyi
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-02-26 13:07:15 +0000
committerGitHub <noreply@github.com>2019-02-26 13:07:15 +0000
commita1a6473293141cf3356bcedc49c1262146976233 (patch)
tree205eb39ac6f53c624002da7c43274b0e5e7273cb /synapse/server.pyi
parentDon't log stack trace when client has gone away during media download (#4738) (diff)
parentCleaner chunk logic (diff)
downloadsynapse-a1a6473293141cf3356bcedc49c1262146976233.tar.xz
Merge pull request #4736 from matrix-org/anoa/public_rooms_federate
Config option to prevent showing non-fed rooms in fed /publicRooms
Diffstat (limited to 'synapse/server.pyi')
-rw-r--r--synapse/server.pyi2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server.pyi b/synapse/server.pyi
index 06cd083a74..fb8df56cd5 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