diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:36:46 -0700 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:36:46 -0700 |
| commit | e3d3fbf63f6b75d3e0adfd71012163a2c673833b (patch) | |
| tree | 0711e2e9bbfabcd83867ff524050c05441187882 /docs/admin_api/user_admin_api.rst | |
| parent | black (diff) | |
| parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
| download | synapse-e3d3fbf63f6b75d3e0adfd71012163a2c673833b.tar.xz | |
Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys
Diffstat (limited to 'docs/admin_api/user_admin_api.rst')
| -rw-r--r-- | docs/admin_api/user_admin_api.rst | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/docs/admin_api/user_admin_api.rst b/docs/admin_api/user_admin_api.rst |
