summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-10 10:56:46 +0100
committerErik Johnston <erik@matrix.org>2015-05-10 10:56:46 +0100
commitd38862a080849488130b1d89f7e547ebb4e4d725 (patch)
treeb299149745a8e0bf9631ae933b94bb7e4de16aa5 /synapse
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentMerge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 (diff)
downloadsynapse-d38862a080849488130b1d89f7e547ebb4e4d725.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/storage/push_rule.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 18b8ff7759..705ea581df 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.9.0-r1" +__version__ = "0.9.0-r3" diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index ee7718d5ed..da23c1a114 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py
@@ -211,7 +211,7 @@ class PushRuleStore(SQLBaseStore): yield self._simple_upsert( PushRuleEnableTable.table_name, {'user_name': user_name, 'rule_id': rule_id}, - {'enabled': enabled}, + {'enabled': 1 if enabled else 0}, desc="set_push_rule_enabled", )