Merge commit 'refs/merge-requests/102' of...

Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102

Merge commit 'refs/merge-requests/102' of...
8a2c5dda · Florian Hülsmann · 85f9869f · 7ed8f397 · 8a2c5dda · 8a2c5dda
Commit 8a2c5dda authored 13 years ago by Florian Hülsmann
--- a/core/img/filetypes/application-sgf.png
+++ b/core/img/filetypes/application-sgf.png
--- a/lib/mimetypes.fixlist.php
+++ b/lib/mimetypes.fixlist.php
@@ -16,5 +16,6 @@ return array(
 	'xls'=>'application/msexcel',
 	'xlsx'=>'application/msexcel',
 	'ppt'=>'application/mspowerpoint',
-	'pptx'=>'application/mspowerpoint'
+	'pptx'=>'application/mspowerpoint',
+	'sgf' => 'application/sgf'
 );