diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-28 16:02:51 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-28 16:02:51 -0700 |
| commit | bc74425872704ad955b37de18639ec831a245761 (patch) | |
| tree | a72a058190905f6f87488d51a97ce02df00f7422 /include/attach.php | |
| parent | 35f17acb388f68745068d6a60e12c7b777b92282 (diff) | |
| download | volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.tar.gz volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.tar.bz2 volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.zip | |
Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge"
This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing
changes made to 58cf5f310d89026fb526e201c301075725044e48.
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index 7123d59fe..b3ddfee88 100644 --- a/include/attach.php +++ b/include/attach.php @@ -74,7 +74,6 @@ function z_mime_content_type($filename) { // 'webm' => 'audio/webm', 'mp4' => 'video/mp4', // 'mp4' => 'audio/mp4', - 'mkv' => 'video/x-matroska', // adobe 'pdf' => 'application/pdf', |