diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-24 13:35:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-24 13:35:58 +0200 |
| commit | 161ca900e00a04ff7db4223c06810985c7ff24ca (patch) | |
| tree | 1c99b71b8504515c2bfa089d48239b813d1e1a67 /lib | |
| parent | 6be0f833d04af59a4eb750022dc720fc6af3ba4b (diff) | |
| parent | 5c213539afe8aa5dcf2e134739cedd20eb76a80d (diff) | |
| download | nextcloud-server-161ca900e00a04ff7db4223c06810985c7ff24ca.tar.gz nextcloud-server-161ca900e00a04ff7db4223c06810985c7ff24ca.zip | |
Merge pull request #17130 from owncloud/update-mime-types
Update wmv and add mts and mt2s
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/mimetypes.list.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index e2b82b256e5..5f222cbd835 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -117,6 +117,8 @@ return array( 'mpg' => array('video/mpeg', null), 'mpo' => array('image/jpeg', null), 'msi' => array('application/x-msi', null), + 'mts' => ['video/MP2T', null], + 'mt2s' => ['video/MP2T', null], 'nef' => array('image/x-dcraw', null), 'numbers' => array('application/x-iwork-numbers-sffnumbers', null), 'odf' => array('application/vnd.oasis.opendocument.formula', null), @@ -176,7 +178,7 @@ return array( 'wav' => array('audio/wav', null), 'webm' => array('video/webm', null), 'woff' => array('application/font-woff', null), - 'wmv' => array('video/x-ms-asf', null), + 'wmv' => array('video/x-ms-wmv', null), 'xcf' => array('application/x-gimp', null), 'xla' => array('application/vnd.ms-excel', null), 'xlam' => array('application/vnd.ms-excel.addin.macroEnabled.12', null), |