Merge pull request #9859 from tiezdne/master

Update mimetypes.list.php

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),