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
commit b006de5485
1 changed files with 1 additions and 1 deletions

View File

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