Merge "First version of AutoblockList special page"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Apr 2017 18:05:36 +0000 (18:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Apr 2017 18:05:36 +0000 (18:05 +0000)
1  2 
autoload.php
docs/hooks.txt
includes/specialpage/SpecialPageFactory.php
languages/i18n/en.json
languages/i18n/qqq.json
languages/messages/MessagesEn.php

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