summaryrefslogtreecommitdiff
path: root/includes/mime.info
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-20 09:00:55 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-20 09:00:55 +0100
commita2190ac74dd4d7080b12bab90e552d7aa81209ef (patch)
tree8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/mime.info
parent15e69f7b20b6596b9148030acce5b59993b95a45 (diff)
parent257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff)
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/mime.info')
-rw-r--r--includes/mime.info2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/mime.info b/includes/mime.info
index 243e2802..840b9d81 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -9,7 +9,7 @@
image/gif [BITMAP]
image/png image/x-png [BITMAP]
image/ief [BITMAP]
-image/jpeg [BITMAP]
+image/jpeg image/pjpeg [BITMAP]
image/jp2 [BITMAP]
image/xbm [BITMAP]
image/tiff [BITMAP]