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)
Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935


Trivial merge