Merge "resourceloader: Only store sources' load.php urls"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 7 Sep 2014 23:10:33 +0000 (23:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 7 Sep 2014 23:10:33 +0000 (23:10 +0000)
1  2 
includes/DefaultSettings.php
includes/resourceloader/ResourceLoader.php
resources/src/mediawiki/mediawiki.js
tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
tests/qunit/suites/resources/mediawiki/mediawiki.test.js

Simple merge
Simple merge