Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
authorfeld <feld@feld.me>
Wed, 2 Sep 2020 17:11:24 +0000 (17:11 +0000)
committerfeld <feld@feld.me>
Wed, 2 Sep 2020 17:11:24 +0000 (17:11 +0000)
commitd1a6f67b1d92e17f4fe3cfc8f296879326897220
tree50fbbe1bf517ab94bd9ce6047f147a3d13f51798
parent0ab03e856480c35ce9478d086f103b396a8e7453
parentcbf7f0e02943f44a73f4418b8c6a8bada06331d8
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'

Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935