diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-30 06:30:46 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-30 06:30:46 -0400 |
| commit | f17f51a9c1f62dc0229e2428cacea4e84313560e (patch) | |
| tree | 7486b05738e943bf39619d06bec9d83d7795e746 /include/attach.php | |
| parent | 5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6 (diff) | |
| parent | d858bd9265a4a0fa3589cdb2126031998310c7c3 (diff) | |
| download | volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.gz volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.bz2 volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
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 40410d41e..f3fb12293 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', |