Merge "API: HTMLize and internationalize the help, add Special:ApiHelp"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 13 Oct 2014 22:19:47 +0000 (22:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 13 Oct 2014 22:19:47 +0000 (22:19 +0000)
1  2 
RELEASE-NOTES-1.25
docs/hooks.txt
includes/AutoLoader.php
includes/DefaultSettings.php
includes/api/ApiTokens.php
includes/specialpage/SpecialPageFactory.php
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

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