Merge "DefaultSettings.php: Use .invalid as invalid e-mail address (RFC 2606)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 Dec 2015 01:14:53 +0000 (01:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 14 Dec 2015 01:14:53 +0000 (01:14 +0000)
1  2 
includes/DefaultSettings.php

Simple merge