diff options
author | Erik Johnston <erik@matrix.org> | 2018-06-25 20:14:34 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-06-25 20:14:34 +0100 |
commit | d46450195b7f9e3b7732f4497160df6a9106931f (patch) | |
tree | eddd8318104a2b503ea4cf0b44d1b2bb14d71796 /docs/admin_api/user_admin_api.rst | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-parts (diff) | |
download | synapse-d46450195b7f9e3b7732f4497160df6a9106931f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'docs/admin_api/user_admin_api.rst')
0 files changed, 0 insertions, 0 deletions