Merge branch 'master' of git://gitorious.org/owncloud/owncloud

14 years ago · baf2fa3a9f
parent 6d8985ceb2 25544d31f9
commit baf2fa3a9f
1 changed files with 2 additions and 0 deletions
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@ -32,6 +32,8 @@ return array(
 	'gz'=>'application/x-gzip',
 	'html'=>'text/html',
 	'htm'=>'text/html',
+	'ics'=>'text/calendar',
+	'ical'=>'text/calendar',
 	'jpeg'=>'image/jpeg',
 	'jpg'=>'image/jpeg',
 	'js'=>'application/javascript',