diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-12-31 13:40:07 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-12-31 13:40:07 +0000 |
commit | 47c25048c551570c97fa71db60c41d3dffa23773 (patch) | |
tree | 0ab55796a669536f110b3d2ee022ae73c3f2c13f /synapse/rest/admin/devices.py | |
parent | Merge commit 'fedfdfd75' into anoa/dinsic_release_1_23_1 (diff) | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-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.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/admin/devices.py b/synapse/rest/admin/devices.py |