Merge "Revert "Prevent new users from being sent emails""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Jan 2018 19:44:11 +0000 (19:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Jan 2018 19:44:11 +0000 (19:44 +0000)
1  2 
includes/user/User.php
languages/i18n/qqq.json

Simple merge
Simple merge