diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-17 15:46:28 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-17 15:46:28 +0200 |
| commit | 918eaef728eaf49387083b39add7106e029fcfb4 (patch) | |
| tree | bd7ae7ad33977cf04cd44a735ccc1465ab7b4ffc /application | |
| parent | 0199f68db46d375af2d4cb831c679d3040601f25 (diff) | |
| parent | 324ef078dda5a3596444152ba49dd591a61adba6 (diff) | |
Merge branch 'release/2.1.1'
Diffstat (limited to 'application')
| -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 f00e5b6ed..100f7d442 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -93,8 +93,8 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'avi' => 'video/x-msvideo', 'movie' => 'video/x-sgi-movie', 'doc' => 'application/msword', - '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', |