Merge branch 'password-reset-fix-for-non-test-env' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 17 Jul 2019 18:09:31 +0000 (18:09 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 17 Jul 2019 18:09:31 +0000 (18:09 +0000)
commit348307ec19a7f6bea1680fda8d726a6bd06f7e99
treee3c37dfbd7e915e87d6a6e893959c3dfd037c5c2
parentce73d5f6a53826c85e46bbe45835b99ceaab67cd
parent4bf2bb9cff2d263e1b022f5c40128ffcbd372746
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'

Fix password reset for non-test env

See merge request pleroma/pleroma!1441