diff --git a/docs/application_services.rst b/docs/application_services.rst index a57bae6194cdb8e818046fca3124973ce7dd7324..7e87ac9ad6bc94a4fd7016e88b0a96859fcb4526 100644 --- a/docs/application_services.rst +++ b/docs/application_services.rst @@ -20,7 +20,7 @@ The format of the AS configuration file is as follows: url: <base url of AS> as_token: <token AS will add to requests to HS> - hs_token: <token HS will ad to requests to AS> + hs_token: <token HS will add to requests to AS> sender_localpart: <localpart of AS user> namespaces: users: # List of users we're interested in diff --git a/synapse/__init__.py b/synapse/__init__.py index 18b8ff77592c516077e057f9961e8efbeaa8e704..705ea581dfc91cf52ba7e7755438ad6f4a50e856 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 ee7718d5edc6066ed055ee46f096cd97d65e8287..da23c1a114ea7ebaa23967079444e37873b5bc82 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", )