diff options
| author | Florian Hülsmann <fh@cbix.de> | 2012-04-04 21:36:50 +0200 |
|---|---|---|
| committer | Florian Hülsmann <fh@cbix.de> | 2012-04-04 21:36:50 +0200 |
| commit | 8a2c5dda6d057b328427de8be1a3c007772c8ced (patch) | |
| tree | 539b8afda5f4711820381e89f5be07c3e2cff656 | |
| parent | 85f9869f6925ef52c1015916bbc28e13c15abc73 (diff) | |
| parent | 7ed8f3974417964df18b135b154fdfdbd4f1b6ca (diff) | |
| download | nextcloud-server-8a2c5dda6d057b328427de8be1a3c007772c8ced.tar.gz nextcloud-server-8a2c5dda6d057b328427de8be1a3c007772c8ced.zip | |
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
| -rw-r--r-- | core/img/filetypes/application-sgf.png | bin | 0 -> 725 bytes | |||
| -rw-r--r-- | lib/mimetypes.fixlist.php | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/img/filetypes/application-sgf.png b/core/img/filetypes/application-sgf.png Binary files differnew file mode 100644 index 00000000000..f171f5579e7 --- /dev/null +++ b/core/img/filetypes/application-sgf.png diff --git a/lib/mimetypes.fixlist.php b/lib/mimetypes.fixlist.php index 51f12dbcc29..a40fbd9e228 100644 --- 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' ); |
