gaja-group
/
server-configs-nginx
mirror of https://github.com/h5bp/server-configs-nginx
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop 

Conflicts:
	node/docs/docco.css
	node/docs/index.html
This commit is contained in:
AD7six 2012-03-28 10:26:14 +02:00
parent 1543d95056 55692f2b23
commit b006de5485
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nginx/mime.types
View File

@ -76,12 +76,12 @@ types {
audio/x-wav wav; audio/x-wav wav;
video/3gpp 3gpp 3gp; video/3gpp 3gpp 3gp;
video/mp4 m4v mp4;
video/mpeg mpeg mpg; video/mpeg mpeg mpg;
video/ogg ogv; video/ogg ogv;
video/quicktime mov; video/quicktime mov;
video/webm webm; video/webm webm;
video/x-flv flv; video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng; video/x-mng mng;
video/x-ms-asf asx asf; video/x-ms-asf asx asf;
video/x-ms-wmv wmv; video/x-ms-wmv wmv;