From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 21 Mar 2015 17:50:39 +0000 (+0000)
Subject: Merge "mediawiki.helplink: Use a SVG+PNG icon"
X-Git-Tag: 1.31.0-rc.0~12027
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=a7192f0978038b4d7ce9bd51e29f97077b407433;p=lhc%2Fweb%2Fwiklou.git

Merge "mediawiki.helplink: Use a SVG+PNG icon"
---

a7192f0978038b4d7ce9bd51e29f97077b407433
diff --cc resources/Resources.php
index c027539cbc,b94fa69566..2c80a8535b
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -897,18 -892,9 +897,18 @@@ return array
  			'feedback-useragent'
  		),
  	),
 +
 +	'mediawiki.filewarning' => array(
 +		'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js',
 +		'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less',
 +		'dependencies' => array(
 +			'oojs-ui',
 +		),
 +	),
 +
  	'mediawiki.helplink' => array(
  		'styles' => array(
- 			'resources/src/mediawiki/mediawiki.helplink.css',
+ 			'resources/src/mediawiki/mediawiki.helplink.less',
  		),
  		'targets' => array( 'desktop', 'mobile' ),
  	),