diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-04 19:07:41 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-04 19:07:41 +0100 |
commit | 9567c60ffa96f25080491019489054973b34edd8 (patch) | |
tree | ca3c3b0abd5813d2549d982d85936af82ba03b7b /docs/admin_api/user_admin_api.rst | |
parent | Ability to send password reset emails (diff) | |
parent | Merge pull request #5341 from matrix-org/babolivier/email_config (diff) | |
download | synapse-9567c60ffa96f25080491019489054973b34edd8.tar.xz |
Merge branch 'develop' into anoa/hs_password_reset_sending_email
Diffstat (limited to 'docs/admin_api/user_admin_api.rst')
-rw-r--r-- | docs/admin_api/user_admin_api.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/admin_api/user_admin_api.rst b/docs/admin_api/user_admin_api.rst |