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:20:38 +0000
committerGitHub <noreply@github.com>2019-02-26 13:20:38 +0000
commitc74624a633ae883474a5ec3137bddd009165144c (patch)
tree0e810f5eddc0ea1fe93059a6a7d5104d11530b09 /synapse/server.pyi
parentMerge pull request #4736 from matrix-org/anoa/public_rooms_federate (diff)
downloadsynapse-c74624a633ae883474a5ec3137bddd009165144c.tar.xz
Revert "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 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