Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

a1a64732

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

Downloads
- Plain Diff

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

Config option to prevent showing non-fed rooms in fed /publicRooms

parents 899a119c c4414768

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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 65 additions, 11 deletions

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

synapse/server.pyi

with 70 additions and 17 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