Merge "Make Minerva skin opt out of parsoid style module"

diff --git a/resources/Resources.php b/resources/Resources.php
index 6926d13..ac83302 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -113,6 +113,7 @@ return array(
                // skin over-rides common content styling.
                'skinStyles' => array(
                        'default' => 'resources/src/mediawiki.skinning/content.parsoid.less',
+                       'minerva' => array(),
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),