summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-04-23 17:57:38 +0200
committerTimothy Warren <tim@timshomepage.net>2012-04-23 17:57:38 +0200
commitc8a2a60c1075e5f725967962663127dad0f9e2e1 (patch)
treed877440f9c3ba20f132ad1c91f70600b77ada409 /system/libraries
parent31d30bcf206ed2e9168b93f74511708d6bc4b505 (diff)
parent274f7d1b42d6ed83c3b22106c945590c05599cdc (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php1
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',