diff options
| author | Greg Aker <greg@gregaker.net> | 2011-11-11 07:37:44 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-11-11 07:37:44 +0100 |
| commit | c3fb51026f780aa353ac643f2188964f1c3139a9 (patch) | |
| tree | 33218f4ce00375b3c2a6a8a6fb2fb2cbdbd23e97 | |
| parent | 46a1de68a663fd7af1a0a08124738cecc84fd5c7 (diff) | |
| parent | 1420188b29b8454c9538040388319127d647ba9e (diff) | |
Merge pull request #653 from mpmont/develop
Added the mime type for pptx.
| -rw-r--r-- | application/config/mimes.php | 1 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 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', diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3a2990b2c..3ddd1ec6a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -32,6 +32,7 @@ Release Date: Not Released - Added support pgp,gpg to mimes.php. - Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php. - Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php. + - Added support pptx office files to mimes.php. - Helpers |