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)
commitbd6294602036fae92a129f0a048455fb717fba73
tree7bca150282ac2e875fdd4434080262e9e189f3a1
parentc2ad9fd5f93b8bbbea19089eb8a2456eb207ff18
parentb64c7b35d429546695550b37ca1e690b46c86f5d
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'

AdminAPI: Confirm user account, resend confirmation email

See merge request pleroma/pleroma!1994
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/user.ex
lib/pleroma/web/router.ex