Merge "Actually make $wgNoReplyAddress default to $wgPasswordSender"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Mar 2016 21:30:58 +0000 (21:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Mar 2016 21:30:58 +0000 (21:30 +0000)
1  2 
includes/Setup.php

Simple merge