Merge branch 'rav/get_devices_api' into develop

This commit is contained in:
Richard van der Hoff 2016-07-21 11:59:30 +01:00
commit 34f56b40fd

View File

@ -103,9 +103,6 @@ class ClientIpStore(SQLBaseStore):
@classmethod @classmethod
def _get_last_client_ip_by_device_txn(cls, txn, devices, retcols): def _get_last_client_ip_by_device_txn(cls, txn, devices, retcols):
def where_clause_for_device(d):
return
where_clauses = [] where_clauses = []
bindings = [] bindings = []
for (user_id, device_id) in devices: for (user_id, device_id) in devices: