Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

c0b6955e

Unverified Commit c0b6955e authored 6 years ago by Andrew Morgan Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate

Revert "Prevent showing non-fed rooms in fed /publicRooms"

parents a1a64732 c74624a6

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/transport/server.py 1 addition, 2 deletions

synapse/federation/transport/server.py
synapse/groups/groups_server.py 4 additions, 2 deletions

synapse/groups/groups_server.py
synapse/handlers/room_list.py 11 additions, 65 deletions

synapse/handlers/room_list.py
synapse/server.pyi 1 addition, 1 deletion

synapse/server.pyi

with 17 additions and 70 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment