From d06876d9fbeeeabdbabf9f0d4820fc3349b59552 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Wed, 16 Jul 2008 17:10:14 +0000
Subject: Added a few openxml document mime types, and an additional mobile
 agent to mimes.php and user_agents.php respectively.

---
 system/application/config/mimes.php | 3 ++-
 user_guide/changelog.html           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index f73858acc..51e444ee1 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -93,12 +93,13 @@ $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'avi'	=>	'video/x-msvideo',
 				'movie'	=>	'video/x-sgi-movie',
 				'doc'	=>	'application/msword',
+				'docx'	=>	'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+				'xlsx'	=>	'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
 				'word'	=>	array('application/msword', 'application/octet-stream'),
 				'xl'	=>	'application/excel',
 				'eml'	=>	'message/rfc822'
 			);
 
 
-
 /* End of file mimes.php */
 /* Location: ./system/application/config/mimes.php */
\ No newline at end of file
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 5106d101b..2c20ce539 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -71,6 +71,7 @@ SVN Revision: XXXX</p>
 	<li>Other changes
 		<ul>
 			<li>Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.</li>
+			<li>Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.</li>
 		</ul>
 	</li>
 </ul>
-- 
cgit v1.2.3-24-g4f1b