Merge "Use skinStyles for mediawiki.ui.icon"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 Oct 2014 07:26:42 +0000 (07:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 1 Oct 2014 07:26:42 +0000 (07:26 +0000)
1  2 
resources/Resources.php

Simple merge