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)
commit0bbc0f0cf4ee87e8ac5995818c8049bf86e848cd
tree1740bc35a064b2eb6a7e8beed0796d1ab7192a89
parent33fbb638cd815037741be25d0e47c3d16cc96971
parent10f82c88b88fa4d26f6fa57f9cf36439012b8d0c
Merge branch 'feature/1078-password-reset' into 'develop'

Feature/1078 password reset

Closes #1078

See merge request pleroma/pleroma!1431