summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-01 18:41:45 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-01 18:41:45 +0100
commitb6c7ec262523dc1ddb618c6aaa11c20fe833ba0f (patch)
tree989e85b77b67d3b7b6e027116361235279c72b2e /application
parentb0b2d041ebad1382bf314fccbae1469a5fe7fad9 (diff)
parente3a68042c086acfc98ae273adbd8527af0c6ab8b (diff)
Merge upstream branch
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 2a68ce9e1..d69497a30 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -120,7 +120,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe
'mov' => 'video/quicktime',
'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'),
'movie' => 'video/x-sgi-movie',
- 'doc' => 'application/msword',
+ 'doc' => array('application/msword', 'application/vnd.ms-office'),
'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'),
'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'),
'word' => array('application/msword', 'application/octet-stream'),