summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-16 20:13:35 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-16 20:13:35 +0200
commit99467898e1630e0ebed1d21bfc1d43cfe8ac857f (patch)
tree304df5a5ee77d0016f2a2318967c864e42597283
parent08c8ae699fd4dfeb0162369e34530d9857e52609 (diff)
parentcd77f92f4ccff0d07ef3a0f8fffae82a0d54fe44 (diff)
downloadnextcloud-server-99467898e1630e0ebed1d21bfc1d43cfe8ac857f.tar.gz
nextcloud-server-99467898e1630e0ebed1d21bfc1d43cfe8ac857f.zip
Merge pull request #9055 from owncloud/add_new_keynote_mimetype
add new keynote mimetype
-rw-r--r--lib/private/mimetypes.list.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index ba1b9ca10b1..d27e9e6348b 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -74,6 +74,7 @@ return array(
'jpg' => array('image/jpeg', null),
'js' => array('application/javascript', 'text/plain'),
'json' => array('application/json', 'text/plain'),
+ 'key' => array('application/x-iwork-keynote-sffkey', null),
'keynote' => array('application/x-iwork-keynote-sffkey', null),
'kra' => array('application/x-krita', null),
'm2t' => array('video/mp2t', null),