Merge "User.php: Update 'setEmailWithConfirmation' for notification email"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 10 Apr 2016 05:30:11 +0000 (05:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 10 Apr 2016 05:30:11 +0000 (05:30 +0000)
1  2 
includes/user/User.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge