Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

4dc945ba

Unverified Commit 4dc945ba authored 6 years ago by Andrew Morgan Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_develop

 Prevent showing non-fed rooms in fed /publicRooms v2

parents c0b6955e 802884d4

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/4746.feature 1 addition, 0 deletions

changelog.d/4746.feature
synapse/federation/transport/server.py 2 additions, 1 deletion

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

synapse/groups/groups_server.py
synapse/handlers/room_list.py 60 additions, 8 deletions

synapse/handlers/room_list.py

with 65 additions and 13 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