diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-07-20 17:40:00 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-07-20 17:40:00 +0100 |
| commit | 7314bf4682754050db4b728b77229fd005df7381 (patch) | |
| tree | 1baf5b1a869a00945303c2d98dc41415dfc37c71 /tox.ini | |
| parent | GET /devices endpoint (diff) | |
| parent | Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips (diff) | |
| download | synapse-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 'tox.ini')
0 files changed, 0 insertions, 0 deletions