diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-10 14:44:57 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-10 14:44:57 +0100 |
| commit | c857bc23d35840a9c3b13ce752ae832385639f73 (patch) | |
| tree | a864a7600d37ca110c3e44c06cc1b55170ad272c /application/config/mimes.php | |
| parent | 172331d40c991741c76fcf70f4262c2db821c6f8 (diff) | |
| parent | 52a31ba3acc5f5be16692ac25c70780775e548e0 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-dh-date-range
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 2a68ce9e1..7ec782b60 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -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'), |