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

This commit is contained in:
Marvin Thomas Rabe 2011-10-03 14:47:41 +02:00
commit baf2fa3a9f
1 changed files with 2 additions and 0 deletions

View File

@ -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',