Author: jacopoc Date: Thu Apr 24 06:49:58 2014 New Revision: 1589610 URL: http://svn.apache.org/r1589610 Log: Applied fix from trunk for revision: 1589606 ===
Fix by Michael Brohl from OFBIZ-5605: Duplicate FileExtension entry for jpg in MimeTypeData.xml Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/content/data/MimeTypeData.xml Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1589606 Modified: ofbiz/branches/release13.07/applications/content/data/MimeTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/data/MimeTypeData.xml?rev=1589610&r1=1589609&r2=1589610&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/content/data/MimeTypeData.xml (original) +++ ofbiz/branches/release13.07/applications/content/data/MimeTypeData.xml Thu Apr 24 06:49:58 2014 @@ -115,7 +115,6 @@ under the License. <FileExtension fileExtensionId="css" mimeTypeId="text/css"/> <FileExtension fileExtensionId="flv" mimeTypeId="video/x-flv"/> <FileExtension fileExtensionId="jpg" mimeTypeId="image/jpeg"/> - <FileExtension fileExtensionId="jpg" mimeTypeId="image/jpeg"/> <FileExtension fileExtensionId="jpeg" mimeTypeId="image/jpeg"/> <FileExtension fileExtensionId="tif" mimeTypeId="image/tiff"/> <FileExtension fileExtensionId="tiff" mimeTypeId="image/tiff"/>