Merge mediawiki.legacy.upload into mediawiki.special.upload
authorAlex Monk <krenair@wikimedia.org>
Fri, 5 Sep 2014 20:34:57 +0000 (21:34 +0100)
committerAlex Monk <krenair@wikimedia.org>
Fri, 5 Sep 2014 20:49:23 +0000 (21:49 +0100)
commit86571c32bfc2e3aaf0c707551ba2f1d304c788c4
tree1562bc8fc0a51035b01ac97b8f9c06dee4f21185
parent0e54ab46dd1e687b257f185061adb84b623c2421
Merge mediawiki.legacy.upload into mediawiki.special.upload

Bug: 31946
Change-Id: Iba7d5a655847f00dde8f11c46dfc13f43b610433
includes/specials/SpecialUpload.php
resources/Resources.php
resources/src/mediawiki.legacy/upload.js [deleted file]
resources/src/mediawiki.special/mediawiki.special.upload.js