summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-11-11 07:37:44 +0100
committerGreg Aker <greg@gregaker.net>2011-11-11 07:37:44 +0100
commitc3fb51026f780aa353ac643f2188964f1c3139a9 (patch)
tree33218f4ce00375b3c2a6a8a6fb2fb2cbdbd23e97 /application/config
parent46a1de68a663fd7af1a0a08124738cecc84fd5c7 (diff)
parent1420188b29b8454c9538040388319127d647ba9e (diff)
Merge pull request #653 from mpmont/develop
Added the mime type for pptx.
Diffstat (limited to 'application/config')
-rw-r--r--application/config/mimes.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index ea0192574..c43f1fc2f 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -57,6 +57,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe
'mif' => 'application/vnd.mif',
'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc',
'dcr' => 'application/x-director',