Merge "Allow extensions to indicate a username doesn't exist"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Sep 2014 22:41:27 +0000 (22:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Sep 2014 22:41:27 +0000 (22:41 +0000)
1  2 
docs/hooks.txt
includes/specials/SpecialUserlogin.php
languages/i18n/en.json
languages/i18n/qqq.json

diff --cc docs/hooks.txt
Simple merge
Simple merge
Simple merge