diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-24 16:42:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-24 16:42:21 +0100 |
commit | fbc5b58d21a595785950e5d9e9be35722757ee17 (patch) | |
tree | 577d680284b7aa66ba6b8593bb062fc6c9df682f /synapse/rest/client/v1/room.py | |
parent | Merge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo (diff) | |
parent | Split public rooms directory auth config in two (diff) | |
download | synapse-fbc5b58d21a595785950e5d9e9be35722757ee17.tar.xz |
Merge pull request #5542 from matrix-org/babolivier/federation-publicrooms dinsic_2019-06-24
Port "Split public rooms directory auth config in two" to dinsic
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py |