Add font mime types
Merge branch 'master' of github.com:square-circle-triangle/nginx

* 'master' of github.com:square-circle-triangle/nginx:
  Add mime types for mp4 and webm

Conflicts:
	files/default/mime.types