Merge remote-tracking branch 'upstream/dev' into website-import

2016-07-30 06:30:46 -04:00
parent 5a63ddd645 d858bd9265
commit f17f51a9c1
38 changed files with 14521 additions and 13995 deletions
--- 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',