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/federation | |
| 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/federation')
| -rw-r--r-- | synapse/federation/transport/server.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 5ba94be2ec..a2396ab466 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -736,8 +736,7 @@ class PublicRoomList(BaseFederationServlet): data = yield self.handler.get_local_public_room_list( limit, since_token, - network_tuple=network_tuple, - from_federation=True, + network_tuple=network_tuple ) defer.returnValue((200, data)) |