Merge "DefaultSettings: fix "advanced example" for $wgPasswordConfig"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Jun 2018 23:26:02 +0000 (23:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Jun 2018 23:26:02 +0000 (23:26 +0000)

Trivial merge