Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-11 09:54:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

Browse Source
This commit is contained in:
Erik Johnston 2015-05-10 10:56:46 +01:00
commit d38862a080
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/application_services.rst
View File

@ -20,7 +20,7 @@ The format of the AS configuration file is as follows:
url: <base url of AS> url: <base url of AS>
as_token: <token AS will add to requests to HS> 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> sender_localpart: <localpart of AS user>
namespaces: namespaces:
users: # List of users we're interested in users: # List of users we're interested in

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.9.0-r1" __version__ = "0.9.0-r3"

2
synapse/storage/push_rule.py
View File

@ -211,7 +211,7 @@ class PushRuleStore(SQLBaseStore):
yield self._simple_upsert( yield self._simple_upsert(
PushRuleEnableTable.table_name, PushRuleEnableTable.table_name,
{'user_name': user_name, 'rule_id': rule_id}, {'user_name': user_name, 'rule_id': rule_id},
{'enabled': enabled}, {'enabled': 1 if enabled else 0},
desc="set_push_rule_enabled", desc="set_push_rule_enabled",
) )