diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:15:47 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:15:47 +0200 |
commit | 5815dba069428514ce39e745328a898fc877773f (patch) | |
tree | 9ba5c1dc7bef0458c5f89e573f1b2acf05f3c688 /system/libraries/Email.php | |
parent | 9c9591c9b4a1d7ac412f7a85aeb5c92f50aa3490 (diff) | |
parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) |
Merge upstream branch
Diffstat (limited to 'system/libraries/Email.php')
-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', |