diff options
author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /application/config/example/mimes.php | |
parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) |
Merge branch 'working'
Diffstat (limited to 'application/config/example/mimes.php')
-rwxr-xr-x | application/config/example/mimes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/example/mimes.php b/application/config/example/mimes.php index 8065794ff..82767d7c8 100755 --- a/application/config/example/mimes.php +++ b/application/config/example/mimes.php @@ -10,7 +10,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', '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'), 'bin' => 'application/macbinary', 'dms' => 'application/octet-stream', 'lha' => 'application/octet-stream', |