diff options
| author | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
|---|---|---|
| committer | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
| commit | f5311f105f6e708d89d9c92c4104dd911cf8be26 (patch) | |
| tree | 271a431c9464250d15a880ede0b17cfb2d111e7f /application/config/mimes.php | |
| parent | 3e1286b00d0bdd37e649fdb706cd7dfddc25447d (diff) | |
| parent | 4b9fec6797db2aea3af8ca4080be73e2ff421080 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index d0e1516ff..1f591ba6b 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -154,5 +154,5 @@ return array( 'vcf' => 'text/x-vcard', 'srt' => array('text/srt', 'text/plain'), 'vtt' => array('text/vtt', 'text/plain'), - 'ico' => 'image/x-icon' + 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon') ); |