summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-09-04 16:56:29 -0700
committerGitHub <noreply@github.com>2019-09-04 16:56:29 -0700
commit19bb5c80241782dbb257aabb40094c1aa8c22847 (patch)
tree97fdf219de3ed852dfe3e35aebe98a4f1122a9ba /synapse/push
parentMerge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff)
parentadd user signature stream change cache to slaved device store (diff)
downloadsynapse-19bb5c80241782dbb257aabb40094c1aa8c22847.tar.xz
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Cross-signing [2/4] - upload/download keys
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py

index c831975635..22491f3700 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -134,7 +134,7 @@ class BulkPushRuleEvaluator(object): pl_event = auth_events.get(POWER_KEY) - return (pl_event.content if pl_event else {}, sender_level) + return pl_event.content if pl_event else {}, sender_level @defer.inlineCallbacks def action_for_event_by_user(self, event, context):