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

diff --combined RELEASE-NOTES-1.25
index 03009bc,c935ffe..71ac5e3
--- 1/RELEASE-NOTES-1.25
--- 2/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@@ -11,16 -11,10 +11,16 @@@ production
  === Configuration changes in 1.25 ===
  
  === New features in 1.25 ===
 +* (bug 58139) ResourceLoaderFileModule now supports language fallback
 +  for 'languageScripts'.
  
  === Bug fixes in 1.25 ===
  
 -=== Web API changes in 1.25 ===
 +=== Action API changes in 1.25 ===
 +* (bug 65403) XML tag highlighting is now only performed for formats
 +  "xmlfm" and "wddxfm".
 +
 +=== Action API internal changes in 1.25 ===
  
  === Languages updated in 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 ==