summary refs log tree commit diff
path: root/synapse/push/baserules.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-27 14:13:14 +0000
committerErik Johnston <erik@matrix.org>2020-10-27 14:13:14 +0000
commitbcb6b243e9e6d0d7c8744e152ed447cbbb58b32e (patch)
tree7c173749c83a7738042bd17786ca8d9f5bf7a9ec /synapse/push/baserules.py
parentMerge branch 'release-v1.22.0' into matrix-org-hotfixes (diff)
parentAdd admin API to list users' local media (#8647) (diff)
downloadsynapse-bcb6b243e9e6d0d7c8744e152ed447cbbb58b32e.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/baserules.py')
-rw-r--r--synapse/push/baserules.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py

index 8047873ff1..2858b61fb1 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py
@@ -37,7 +37,7 @@ def list_with_base_rules(rawrules, use_new_defaults=False): modified_base_rules = {r["rule_id"]: r for r in rawrules if r["priority_class"] < 0} # Remove the modified base rules from the list, They'll be added back - # in the default postions in the list. + # in the default positions in the list. rawrules = [r for r in rawrules if r["priority_class"] >= 0] # shove the server default rules for each kind onto the end of each