diff options
| author | zottel <github@zottel.net> | 2016-07-31 02:14:33 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-07-31 02:14:33 +0200 |
| commit | b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f (patch) | |
| tree | d09bc96d4f78df033b76513242bbb80ff57240bd /include/attach.php | |
| parent | e5a3179468c84ab78ffa655353bc068508e8cdfd (diff) | |
| parent | da9b6690e565452a9a9d69084a07ac48005d7e60 (diff) | |
| download | volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.tar.gz volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.tar.bz2 volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/attach.php b/include/attach.php index b3ddfee88..7123d59fe 100644 --- a/include/attach.php +++ b/include/attach.php @@ -74,6 +74,7 @@ function z_mime_content_type($filename) { // 'webm' => 'audio/webm', 'mp4' => 'video/mp4', // 'mp4' => 'audio/mp4', + 'mkv' => 'video/x-matroska', // adobe 'pdf' => 'application/pdf', |