diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-05 17:33:12 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-05 17:33:12 +0100 |
| commit | c2e9225eec976326df36b666d6baf6db29eee831 (patch) | |
| tree | ace703f9c298b2b1d5f9d1f8a2289b03b8de0212 /application/config/mimes.php | |
| parent | 5e16ec6b33ed6a80bf511b2bf6eb4fc5a1103c94 (diff) | |
| parent | 27324cd6ae2b076d3346e3585f312f7a61a5a897 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
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 f31fff2ec..3815a5aa9 100644 --- a/application/config/mimes.php +++ b/application/config/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/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', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), 'bin' => 'application/macbinary', 'dms' => 'application/octet-stream', 'lha' => 'application/octet-stream', |