Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection

This commit is contained in:
Saleh Souzanchi 2013-10-28 03:35:44 +03:30
commit 8844e54647

View file

@ -300,6 +300,7 @@ class CakeResponse {
'webapp' => 'application/x-web-app-manifest+json',
'vcf' => 'text/x-vcard',
'vtt' => 'text/vtt',
'mkv' => 'video/x-matroska',
);
/**