diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-14 11:43:03 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2019-05-14 11:43:03 +0100 |
commit | f608ddbe5c58f35b76c5b1199c60a6c17a684d19 (patch) | |
tree | cfc254400db8c0d3d9cdcef7942e935b09ba4f1d /docs/admin_api/user_admin_api.rst | |
parent | Merge pull request #5115 from matrix-org/babolivier/lookup_path (diff) | |
parent | 0.99.4rc1 (diff) | |
download | synapse-f608ddbe5c58f35b76c5b1199c60a6c17a684d19.tar.xz |
Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14
Diffstat (limited to 'docs/admin_api/user_admin_api.rst')
-rw-r--r-- | docs/admin_api/user_admin_api.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/admin_api/user_admin_api.rst b/docs/admin_api/user_admin_api.rst |