dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed race condition in MessageCache::replace"
[lhc/web/wiklou.git]
/
includes
/
mime.info
diff --git
a/includes/mime.info
b/includes/mime.info
index
b86d7d7
..
243e280
100644
(file)
--- 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/jp2 [BITMAP]
image/xbm [BITMAP]
image/tiff [BITMAP]
-image/x-icon image/x-ico [BITMAP]
+image/x-icon image/x-ico
image/vnd.microsoft.icon
[BITMAP]
image/x-rgb [BITMAP]
image/x-portable-pixmap [BITMAP]
image/x-portable-graymap image/x-portable-greymap [BITMAP]
image/x-rgb [BITMAP]
image/x-portable-pixmap [BITMAP]
image/x-portable-graymap image/x-portable-greymap [BITMAP]
@@
-72,6
+72,7
@@
text/tab-separated-values [TEXT]
application/zip application/x-zip [ARCHIVE]
application/x-gzip [ARCHIVE]
application/x-bzip [ARCHIVE]
application/zip application/x-zip [ARCHIVE]
application/x-gzip [ARCHIVE]
application/x-bzip [ARCHIVE]
+application/x-bzip2 [ARCHIVE]
application/x-tar [ARCHIVE]
application/x-stuffit [ARCHIVE]
application/x-opc+zip [ARCHIVE]
application/x-tar [ARCHIVE]
application/x-stuffit [ARCHIVE]
application/x-opc+zip [ARCHIVE]