Merge branch 'admin-api-change-password' into 'develop'
authorlain <lain@soykaf.club>
Tue, 24 Mar 2020 17:34:13 +0000 (17:34 +0000)
committerlain <lain@soykaf.club>
Tue, 24 Mar 2020 17:34:13 +0000 (17:34 +0000)
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`

See merge request pleroma/pleroma!2149

1  2 
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs

diff --cc CHANGELOG.md
Simple merge
Simple merge
Simple merge