summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorMichiel Vugteveen <michiel@it-can.nl>2012-02-29 14:15:40 +0100
committerMichiel Vugteveen <michiel@it-can.nl>2012-02-29 14:15:40 +0100
commit044e39df6febd2b59e6aacbdf45befba4f297005 (patch)
tree9170bbbb59f7c11b442c6f1566d4a0046d52c8e5 /application
parente2fc9af9fef1d3b00ecdf3341dd37ae6755be308 (diff)
parentb692ccb2414928913ebd713a094fc3150db07495 (diff)
updated branch
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 70fe2b80d..d69497a30 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -121,8 +121,8 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe
'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'),
'movie' => 'video/x-sgi-movie',
'doc' => array('application/msword', 'application/vnd.ms-office'),
- 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ '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'),
'xl' => 'application/excel',
'eml' => 'message/rfc822',