diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:16:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:16:35 +0200 |
| commit | 87ac4260063e3a62805cc8f6f73cd2eb18da663a (patch) | |
| tree | 8a2463b964a5e7dd6aa606349a4251f70191fce1 /system/libraries | |
| parent | a58c0b695a0590aff07a42ad2ad81b544e226af9 (diff) | |
| parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlsrv
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 48c3bf3ab..103c3cb25 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1891,6 +1891,7 @@ class CI_Email { 'tiff' => 'image/tiff', 'tif' => 'image/tiff', 'css' => 'text/css', + 'ics' => 'text/calendar', 'html' => 'text/html', 'htm' => 'text/html', 'shtml' => 'text/html', |