diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
| commit | 042766bac61958a21ba5d6b3c53b0e4296fdcce7 (patch) | |
| tree | df9e26699ddb5d3841a0d1cc1795913c819bf611 /system/libraries/Email.php | |
| parent | 0688ac9ad88a03f1c56cfcd9e3c475b83301344d (diff) | |
| parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
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', |