Merge "Add a preference to require email for password resets"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 10 Sep 2019 08:41:00 +0000 (08:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 10 Sep 2019 08:41:00 +0000 (08:41 +0000)
1  2 
includes/DefaultSettings.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge