From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 8 Jun 2017 15:57:44 +0000 (+0000)
Subject: Merge "Do not disable password reset for blocks meant to force login"
X-Git-Tag: 1.31.0-rc.0~3030
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=c543e0b7b2b0eec97cacd24acefa9e05cd03ecbe;p=lhc%2Fweb%2Fwiklou.git

Merge "Do not disable password reset for blocks meant to force login"
---

c543e0b7b2b0eec97cacd24acefa9e05cd03ecbe