Merge branch 'feature/force-password-reset' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 23 Sep 2019 22:42:34 +0000 (22:42 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 23 Sep 2019 22:42:34 +0000 (22:42 +0000)
Admin API: Add ability to require password reset

See merge request pleroma/pleroma!1705

1  2 
CHANGELOG.md
docs/api/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/user_test.exs

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