Merge "Password reset link is shown when no reset options are available"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 10 Oct 2016 21:40:32 +0000 (21:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 10 Oct 2016 21:40:32 +0000 (21:40 +0000)

Trivial merge