diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-07 07:31:12 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-07 07:31:12 -0800 |
| commit | 3abe4c3e88a25271657038c36d6680801246db21 (patch) | |
| tree | f650b2b9dacdb097a2416dc69561a26fec4cc001 /lib | |
| parent | 970eed2867913f97f503e32adbed0bd3ace4ad97 (diff) | |
| parent | 9404a8f40c51f57309d3b5a3b5937f869d563573 (diff) | |
| download | nextcloud-server-3abe4c3e88a25271657038c36d6680801246db21.tar.gz nextcloud-server-3abe4c3e88a25271657038c36d6680801246db21.zip | |
Merge pull request #6663 from owncloud/fix_empty_mimetypes
remove duplicate exe mimetype, add correct msi mimetype
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/mimetypes.list.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index 740982910e0..08228336966 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -66,6 +66,7 @@ return array( 'xlsx'=>'application/msexcel', 'php'=>'application/x-php', 'exe'=>'application/x-ms-dos-executable', + 'msi'=>'application/x-msi', 'pl'=>'application/x-pearl', 'py'=>'application/x-python', 'blend'=>'application/x-blender', @@ -97,8 +98,6 @@ return array( 'ai' => 'application/illustrator', 'epub' => 'application/epub+zip', 'mobi' => 'application/x-mobipocket-ebook', - 'exe' => 'application', - 'msi' => 'application', 'md' => 'text/markdown', 'markdown' => 'text/markdown', 'mdown' => 'text/markdown', |