diff options
| author | dchill42 <dchill42@gmail.com> | 2012-07-31 15:41:01 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-07-31 15:41:01 +0200 |
| commit | 7e92b7332ea4d28648e69eabcb93cead35dbca26 (patch) | |
| tree | b7714536b89557129ed51fe675725fe28639c1e0 /application/config/mimes.php | |
| parent | 57486009573a86d9e286a49c92216ba17aae0d5a (diff) | |
| parent | 3a2d573a96241c01124d15c1ce517078e07c6235 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'application/config/mimes.php')
| -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 4b1d6a85d..a239bb254 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -37,7 +37,7 @@ return array( 'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), + 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain'), 'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'), 'dms' => 'application/octet-stream', 'lha' => 'application/octet-stream', |