Merge branch 'issue/1878' into 'develop'
authorlain <lain@soykaf.club>
Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
committerlain <lain@soykaf.club>
Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
commit250e0369c72292a255b0fe078e5a2202c00fa4c7
tree9e41867663d779825db28e90963790d9cd3e2024
parenta81581472fed4ca736e71dad11dc29882eca975f
parent777a7edc6b4bf8b9e0ff3b86bdb780f8f2ae2610
Merge branch 'issue/1878' into 'develop'

[#1878] fix reset confirmation email in admin section

See merge request pleroma/pleroma!2751
lib/pleroma/user.ex
test/web/admin_api/controllers/admin_api_controller_test.exs