diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-26 12:58:12 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-26 12:58:12 +0200 |
| commit | bb2e518754e703be095df9d8fd7cb3d82a5d3bbe (patch) | |
| tree | ab2ed2e5e9b9d4ef66fb30cb221c43a8ef693cdc /application/config/mimes.php | |
| parent | 0336dc228c84695ec75fc8dccedac354d1556de9 (diff) | |
| parent | e684bdac2d6282e3b9a5c57e1006d5ed1664f647 (diff) | |
Merge upstream branch
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 7ec782b60..02e12c011 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -34,7 +34,8 @@ | */ -$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), +$mimes = 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'), 'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'), @@ -165,4 +166,4 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ +/* Location: ./application/config/mimes.php */
\ No newline at end of file |