summaryrefslogtreecommitdiffstats
path: root/system/libraries/Email.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:15:36 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:15:36 +0200
commitba4636187a745a287c81517fbc53f2f30fe16d88 (patch)
treebdcb56cc80e72735d0118f3abf91e04f0dfba5cd /system/libraries/Email.php
parentcdfbd5281e4dec7278a07943832c2590c1141eb3 (diff)
parentf3b0074b0ccaadef31737cbd6be21ec7272f7538 (diff)
Fixed conflicts.
Diffstat (limited to 'system/libraries/Email.php')
-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',