projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48a82c4 5e9759c)
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)
Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/admin_api/admin_api_controller.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git