From: Sean Colombo <sean_colombo@users.mediawiki.org>
Date: Wed, 14 Sep 2011 00:27:48 +0000 (+0000)
Subject: Merged Wikia change.
X-Git-Tag: 1.31.0-rc.0~27687
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=fe2af2f8d3982933ef2b2383584ada9c3ae0460b;p=lhc%2Fweb%2Fwiklou.git

Merged Wikia change.
---

diff --git a/includes/mime.info b/includes/mime.info
index d705715dc6..b0d501224b 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -13,7 +13,7 @@ image/jpeg	[BITMAP]
 image/jp2	[BITMAP]
 image/xbm	[BITMAP]
 image/tiff	[BITMAP]
-image/x-icon	[BITMAP]
+image/x-icon image/x-ico	[BITMAP]
 image/x-rgb	[BITMAP]
 image/x-portable-pixmap		[BITMAP]
 image/x-portable-graymap image/x-portable-greymap	[BITMAP]