Merge "Do not disable password reset for blocks meant to force login"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 8 Jun 2017 15:57:44 +0000 (15:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 8 Jun 2017 15:57:44 +0000 (15:57 +0000)

Trivial merge