summary refs log tree commit diff
path: root/synapse/rest/client/v1/push_rule.py
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-02-26 13:22:06 +0000
committerGitHub <noreply@github.com>2019-02-26 13:22:06 +0000
commitc0b6955e3b6d4ee40333b68f35a6cf96925c342a (patch)
tree0e810f5eddc0ea1fe93059a6a7d5104d11530b09 /synapse/rest/client/v1/push_rule.py
parentMerge pull request #4736 from matrix-org/anoa/public_rooms_federate (diff)
parentRevert "Prevent showing non-fed rooms in fed /publicRooms" (diff)
downloadsynapse-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/rest/client/v1/push_rule.py')
0 files changed, 0 insertions, 0 deletions