From: kaniini <ariadne@dereferenced.org>
Date: Tue, 16 Jul 2019 21:44:50 +0000 (+0000)
Subject: Merge branch 'feature/1078-password-reset' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=inline;h=0bbc0f0cf4ee87e8ac5995818c8049bf86e848cd;hp=-c;p=akkoma

Merge branch 'feature/1078-password-reset' into 'develop'

Feature/1078 password reset

Closes #1078

See merge request pleroma/pleroma!1431
---

0bbc0f0cf4ee87e8ac5995818c8049bf86e848cd