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)
1  2 
includes/specials/SpecialUpload.php
resources/Resources.php

Simple merge
Simple merge