Merge "Add ForeignUpload and ForeignStructuredUpload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Sep 2015 16:27:31 +0000 (16:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Sep 2015 16:27:31 +0000 (16:27 +0000)
1  2 
maintenance/jsduck/categories.json
resources/Resources.php
tests/qunit/QUnitTestResources.php

Simple merge
Simple merge
Simple merge