Merge "Merge mediawiki.legacy.upload into mediawiki.special.upload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Sep 2014 16:46:09 +0000 (16:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Sep 2014 16:46:09 +0000 (16:46 +0000)
commitcbc41c4308840cc30a5b933c8eb04dc86c363b48
tree175c6c85c218fc6028a4c9cdf655a69796574477
parent84c1186a08706f73e337393bd1a5a3a5ec6cfe7b
parent86571c32bfc2e3aaf0c707551ba2f1d304c788c4
Merge "Merge mediawiki.legacy.upload into mediawiki.special.upload"
includes/specials/SpecialUpload.php
resources/Resources.php