diff options
author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-03 14:47:41 +0200 |
---|---|---|
committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-03 14:47:41 +0200 |
commit | baf2fa3a9f7214632f518eb90c2c21af7ab6c942 (patch) | |
tree | 1d41481294277ea95944d1467ed94e13431f189e /lib | |
parent | 6d8985ceb25c6423535cab986fefe77c27758970 (diff) | |
parent | 25544d31f91fe97b03360d2285a6317129fdf0ac (diff) | |
download | nextcloud-server-baf2fa3a9f7214632f518eb90c2c21af7ab6c942.tar.gz nextcloud-server-baf2fa3a9f7214632f518eb90c2c21af7ab6c942.zip |
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mimetypes.list.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php index 24679257199..e0570e84ea5 100644 --- 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', |