Merge branch '2317-old-reset-tokens' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 19 Nov 2020 16:22:14 +0000 (16:22 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 19 Nov 2020 16:22:14 +0000 (16:22 +0000)
Resolve "Don't allow old password reset tokens"

Closes #2317

See merge request pleroma/pleroma!3160

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge