aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-07-28 11:16:43 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-28 11:16:43 +0200
commit0aa652ecfdaf4cbb7fbb0fd49256e644f86df71e (patch)
tree7ef7337d4e716c21db303b1fd5d0dbb8114c63f4
parentcfaa05cc0e76e2e43fad9d047c0bbb8659f2808e (diff)
parent6a2f3921f6d57d1b28647ca7b2c99e5ef5ec8a6e (diff)
downloadnextcloud-server-0aa652ecfdaf4cbb7fbb0fd49256e644f86df71e.tar.gz
nextcloud-server-0aa652ecfdaf4cbb7fbb0fd49256e644f86df71e.zip
Merge pull request #9859 from tiezdne/master
Update mimetypes.list.php
-rw-r--r--lib/private/mimetypes.list.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index d27e9e6348b..8db78361433 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -28,6 +28,7 @@
* is considered secure.
*/
return array(
+ '3gp' => array('video/3gpp', null),
'7z' => array('application/x-7z-compressed', null),
'accdb' => array('application/msaccess', null),
'ai' => array('application/illustrator', null),
@@ -137,6 +138,7 @@ return array(
'txt' => array('text/plain', null),
'vcard' => array('text/vcard', null),
'vcf' => array('text/vcard', null),
+ 'vob' => array('video/dvd', null),
'wav' => array('audio/wav', null),
'webm' => array('video/webm', null),
'woff' => array('application/font-woff', null),