From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:56:50 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 application/config/mimes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'application/config/mimes.php')

diff --git a/application/config/mimes.php b/application/config/mimes.php
index e573ed061..8065794ff 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -1,9 +1,9 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /*
 | -------------------------------------------------------------------
 | MIME TYPES
 | -------------------------------------------------------------------
-| This file contains an array of mime types. It is used by the
+| This file contains an array of mime types.  It is used by the
 | Upload class to help identify allowed file types.
 |
 */
@@ -51,7 +51,7 @@ $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'tgz'	=>	array('application/x-tar', 'application/x-gzip-compressed'),
 				'xhtml'	=>	'application/xhtml+xml',
 				'xht'	=>	'application/xhtml+xml',
-				'zip'	=> array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
+				'zip'	=>  array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
 				'mid'	=>	'audio/midi',
 				'midi'	=>	'audio/midi',
 				'mpga'	=>	'audio/mpeg',
@@ -71,7 +71,7 @@ $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'jpeg'	=>	array('image/jpeg', 'image/pjpeg'),
 				'jpg'	=>	array('image/jpeg', 'image/pjpeg'),
 				'jpe'	=>	array('image/jpeg', 'image/pjpeg'),
-				'png'	=>	array('image/png', 'image/x-png'),
+				'png'	=>	array('image/png',  'image/x-png'),
 				'tiff'	=>	'image/tiff',
 				'tif'	=>	'image/tiff',
 				'css'	=>	'text/css',
-- 
cgit v1.2.3-24-g4f1b


From 277c57c5c43a0f3ede09d679085485bc50c44b88 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Wed, 10 Aug 2011 09:00:13 -0600
Subject: Added application/x-csv as a mime.

---
 application/config/mimes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/config/mimes.php')

diff --git a/application/config/mimes.php b/application/config/mimes.php
index 8065794ff..82767d7c8 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/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',
-- 
cgit v1.2.3-24-g4f1b