Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/getgrav/grav into 1.6

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	composer.lock
#	system/defines.php
This commit is contained in:
Matias Griese 2018-10-24 13:23:51 +03:00
commit b4e40a669d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/config/media.yaml
View File

@ -53,7 +53,7 @@ types:
thumb: media/thumb-flv.png
mime: video/x-flv
webm:
type: file
type: video
thumb: media/thumb-webm.png
mime: video/webm
ogv: