summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-26 14:58:49 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-26 14:58:49 +0100
commitfff790540991363c0d749e4dc4d17a958516ff8f (patch)
treec670822feb7b6b8cf3bb00f62d0d8a8704cf3355 /synapse
parentchangelog (diff)
parentTake a dict of the rule, not the rule list (diff)
downloadsynapse-fff790540991363c0d749e4dc4d17a958516ff8f.tar.xz
Merge branch 'bugs/SYN-390' into release-v0.9.1
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py

index 167b973b2b..8059fff1b2 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py
@@ -76,7 +76,7 @@ class Pusher(object): rules = [] for rawrule in rawrules: - rule = dict(rawrules) + rule = dict(rawrule) rule['conditions'] = json.loads(rawrule['conditions']) rule['actions'] = json.loads(rawrule['actions']) rules.append(rule)