Merge "resourceloader: Wrap only=script responses in "if(window.mw)""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Aug 2014 00:50:10 +0000 (00:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Aug 2014 00:50:10 +0000 (00:50 +0000)
1  2 
includes/OutputPage.php
includes/resourceloader/ResourceLoader.php
includes/resourceloader/ResourceLoaderStartUpModule.php
resources/Resources.php
tests/phpunit/includes/OutputPageTest.php

Simple merge
Simple merge