From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 25 Sep 2014 21:31:44 +0000 (+0000)
Subject: Merge "Revert "Set site logo url in ResourceLoaderSiteModule instead of inline styles""
X-Git-Tag: 1.31.0-rc.0~13817
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=e681b2641c7daddca15444bcb26c63100efcd6f8;p=lhc%2Fweb%2Fwiklou.git

Merge "Revert "Set site logo url in ResourceLoaderSiteModule instead of inline styles""
---

e681b2641c7daddca15444bcb26c63100efcd6f8
diff --cc RELEASE-NOTES-1.25
index 03009bc680,c935ffeb39..71ac5e380e
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@@ -31,10 -25,8 +31,8 @@@ changes to languages because of Bugzill
  === Other changes in 1.25 ===
  * The skin autodiscovery mechanism, deprecated in MediaWiki 1.23, has been
    removed. See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for
 -  migration guide for creators and users of custom skins that relied on it. 
 +  migration guide for creators and users of custom skins that relied on it.
  * Javascript variable 'wgFileCanRotate' now only available on Special:Upload.
- * (bug 56257) Set site logo url in ResourceLoaderSiteModule instead of inline
-   styles in the HTML output.
  
  == Compatibility ==