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

This commit is contained in:
Erik Johnston 2014-08-18 11:14:57 +01:00
commit 1c2caacd67
17 changed files with 1232 additions and 131 deletions

View file

@ -67,6 +67,7 @@ class PresenceStore(SQLBaseStore):
table="presence_allow_inbound",
keyvalues={"observed_user_id": observed_localpart,
"observer_user_id": observer_userid},
retcols=["observed_user_id"],
allow_none=True,
)