Merge branch 'feature/1078-password-reset' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 16 Jul 2019 21:44:50 +0000 (21:44 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 16 Jul 2019 21:44:50 +0000 (21:44 +0000)
Feature/1078 password reset

Closes #1078

See merge request pleroma/pleroma!1431


Trivial merge