diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-06-04 07:44:06 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-06-04 07:44:06 +0200 |
| commit | b7f98421571e049f257fbc78e70d6e27a3b233f8 (patch) | |
| tree | 6d448011a24f86ac46ffb0db7b6f81c2bfcd7684 /application | |
| parent | 6373276f1ac940a42e7f48b5e0867ddbc5ca2823 (diff) | |
| parent | 717e9c9adb5bd9d181ee9a35e2febf654ee925c3 (diff) | |
Merge pull request #3079 from seanfahey/develop
Added MIME types for .ppt uploads
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 8123557f4..ccca69220 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -58,7 +58,7 @@ return array( 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', 'xls' => array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'), - 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), + 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint', 'application/vnd.ms-office', 'application/msword'), 'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/x-zip', 'application/zip'), 'wbxml' => 'application/wbxml', 'wmlc' => 'application/wmlc', |