summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-07-20 17:40:00 +0100
committerRichard van der Hoff <richard@matrix.org>2016-07-20 17:40:00 +0100
commit7314bf4682754050db4b728b77229fd005df7381 (patch)
tree1baf5b1a869a00945303c2d98dc41415dfc37c71 /res
parentGET /devices endpoint (diff)
parentMerge pull request #938 from matrix-org/rav/add_device_id_to_client_ips (diff)
downloadsynapse-7314bf4682754050db4b728b77229fd005df7381.tar.xz
Merge branch 'develop' into rav/get_devices_api
(pick up PR #938 in the hope of fixing the UTs)
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions