diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:17:56 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:17:56 +0200 |
commit | 721c77fcf347751895623514fb2e4c89390afa67 (patch) | |
tree | cb1f7b5f7688d9090e9a90960a17d188ceef8083 /system/libraries | |
parent | 871a6f979e4291365c40247158ccde8fccca3ae5 (diff) | |
parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) |
Merge upstream branch
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', |