diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-10-22 22:30:21 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-10-22 22:30:21 +0200 |
| commit | d64c51bbe95a6325736bb41c510a15d822fc8ba5 (patch) | |
| tree | 51a06689b63d13150ef55f39178bc41610210ec8 /application | |
| parent | 421133d06fd682e4672c5e73d65b836e5e62a57d (diff) | |
| parent | 4051f1c307457325b8daae3f08d601db5737a5bf (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index bab431f77..9903bd89f 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -170,6 +170,7 @@ return array( 'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'), 'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'), 'ics' => 'text/calendar', + 'ical' => 'text/calendar', 'zsh' => 'text/x-scriptzsh', '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), @@ -180,4 +181,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */
\ No newline at end of file +/* Location: ./application/config/mimes.php */ |