summary refs log tree commit diff
path: root/synapse/rest/admin/devices.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 13:40:07 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 13:40:07 +0000
commit47c25048c551570c97fa71db60c41d3dffa23773 (patch)
tree0ab55796a669536f110b3d2ee022ae73c3f2c13f /synapse/rest/admin/devices.py
parentMerge commit 'fedfdfd75' into anoa/dinsic_release_1_23_1 (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-47c25048c551570c97fa71db60c41d3dffa23773.tar.xz
Merge commit '24229fac0' into anoa/dinsic_release_1_23_1
Diffstat (limited to 'synapse/rest/admin/devices.py')
-rw-r--r--synapse/rest/admin/devices.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/admin/devices.py b/synapse/rest/admin/devices.py

index a163863322..ffd3aa38f7 100644 --- a/synapse/rest/admin/devices.py +++ b/synapse/rest/admin/devices.py
@@ -119,7 +119,7 @@ class DevicesRestServlet(RestServlet): raise NotFoundError("Unknown user") devices = await self.device_handler.get_devices_by_user(target_user.to_string()) - return 200, {"devices": devices} + return 200, {"devices": devices, "total": len(devices)} class DeleteDevicesRestServlet(RestServlet):