Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
authorlain <lain@soykaf.club>
Fri, 22 Nov 2019 15:39:19 +0000 (15:39 +0000)
committerlain <lain@soykaf.club>
Fri, 22 Nov 2019 15:39:19 +0000 (15:39 +0000)
AdminAPI: Confirm user account, resend confirmation email

See merge request pleroma/pleroma!1994

1  2 
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/user.ex
lib/pleroma/web/router.ex

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