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

This commit is contained in:
Erik Johnston 2019-09-25 17:53:13 +01:00
commit 4fb3c129aa
42 changed files with 1318 additions and 496 deletions

View file

@ -397,7 +397,7 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
"""
keyvalues = {"user_id": user_id}
if device_id:
if device_id is not None:
keyvalues["device_id"] = device_id
res = yield self._simple_select_list(