Fix merge
This commit is contained in:
parent
378894d64d
commit
550ab6fd8c
@ -1113,7 +1113,7 @@ final class MimeTypes implements MimeTypesInterface
|
|||||||
'audio/mp2' => ['mp2'],
|
'audio/mp2' => ['mp2'],
|
||||||
'audio/mp3' => ['mp3', 'mpga'],
|
'audio/mp3' => ['mp3', 'mpga'],
|
||||||
'audio/mp4' => ['m4a', 'mp4a', 'f4a'],
|
'audio/mp4' => ['m4a', 'mp4a', 'f4a'],
|
||||||
'audio/mpeg' => ['mpga', 'mp2', 'mp2a', 'mp3', 'm2a', 'm3a'],
|
'audio/mpeg' => ['mp3', 'mpga', 'mp2', 'mp2a', 'm2a', 'm3a'],
|
||||||
'audio/mpegurl' => ['m3u', 'm3u8', 'vlc'],
|
'audio/mpegurl' => ['m3u', 'm3u8', 'vlc'],
|
||||||
'audio/ogg' => ['oga', 'ogg', 'spx', 'opus'],
|
'audio/ogg' => ['oga', 'ogg', 'spx', 'opus'],
|
||||||
'audio/prs.sid' => ['sid', 'psid'],
|
'audio/prs.sid' => ['sid', 'psid'],
|
||||||
|
Reference in New Issue
Block a user