Merge branch 'feature/return-link-for-password-reset' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 03:12:03 +0000 (03:12 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 03:12:03 +0000 (03:12 +0000)
commita39e065916f16a5fe111cd6e6c73d211dbd1b9f5
tree76880e696f24284ace852a03c3008d48c057f5fe
parent48a82c46096a560fe9331a63f19ace6faaf98c3d
parent5e9759cd7d0730c14bcc44e9b3dbda94947d602f
Merge branch 'feature/return-link-for-password-reset' into 'develop'

Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691
CHANGELOG.md
lib/pleroma/web/admin_api/admin_api_controller.ex