diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-06 15:05:19 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-06 15:05:19 +0100 |
| commit | 2aff25e8d4d7b29c07803d231532d362a5e457dd (patch) | |
| tree | 0f9bec770e54678f068cf04a2e51c2b59bf4ed64 /application | |
| parent | a9f7e8cfb16b53394a5f77393e4ab3e93ef9001e (diff) | |
| parent | 6c4daef7ace73e1e9bacb511f646ade778763ff9 (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 1f591ba6b..aa3b1836a 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -77,6 +77,14 @@ return array( 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), 'jpe' => array('image/jpeg', 'image/pjpeg'), + 'jp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'j2k' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpf' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpg2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpx' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', |