Merge "Make Minerva skin opt out of parsoid style module"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 10 Jun 2014 19:01:20 +0000 (19:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 10 Jun 2014 19:01:20 +0000 (19:01 +0000)
1  2 
resources/Resources.php

Simple merge