summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-26 16:02:59 +0100
committerErik Johnston <erik@matrix.org>2015-05-26 16:02:59 +0100
commit99eb1172b07f514f6ec9775e5572c7dc23ee552c (patch)
treec5cefd5b0334185780ffa8d391cb2d2f70c003af /synapse/push
parentMerge pull request #166 from matrix-org/bugs/SYN-390 (diff)
parentchangelog (diff)
downloadsynapse-99eb1172b07f514f6ec9775e5572c7dc23ee552c.tar.xz
Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/push')
-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)