Merged Wikia change.
authorSean Colombo <sean_colombo@users.mediawiki.org>
Wed, 14 Sep 2011 00:27:48 +0000 (00:27 +0000)
committerSean Colombo <sean_colombo@users.mediawiki.org>
Wed, 14 Sep 2011 00:27:48 +0000 (00:27 +0000)
includes/mime.info

index d705715..b0d5012 100644 (file)
@@ -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]