Mercurial > hg > soundsoftware-site
comparison lib/redmine/mime_type.rb @ 511:107d36338b70 live
Merge from branch "cannam"
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:43:07 +0100 |
parents | cbce1fd3b1b7 |
children | cbb26bc654de |
comparison
equal
deleted
inserted
replaced
451:a9f6345cb43d | 511:107d36338b70 |
---|---|
35 'text/x-csh' => 'csh', | 35 'text/x-csh' => 'csh', |
36 'text/x-sh' => 'sh', | 36 'text/x-sh' => 'sh', |
37 'text/xml' => 'xml,xsd,mxml', | 37 'text/xml' => 'xml,xsd,mxml', |
38 'text/yaml' => 'yml,yaml', | 38 'text/yaml' => 'yml,yaml', |
39 'text/csv' => 'csv', | 39 'text/csv' => 'csv', |
40 'text/x-po' => 'po', | |
40 'image/gif' => 'gif', | 41 'image/gif' => 'gif', |
41 'image/jpeg' => 'jpg,jpeg,jpe', | 42 'image/jpeg' => 'jpg,jpeg,jpe', |
42 'image/png' => 'png', | 43 'image/png' => 'png', |
43 'image/tiff' => 'tiff,tif', | 44 'image/tiff' => 'tiff,tif', |
44 'image/x-ms-bmp' => 'bmp', | 45 'image/x-ms-bmp' => 'bmp', |