Steve Heffernan 055d81dc3a Merge branch 'stable' ...

Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video.dev.js
	dist/video-js/video.js

2014-08-20 15:17:08 -07:00

..

api

Release 4.7.3

2014-08-20 15:16:22 -07:00

guides

Merge branch 'stable'

2014-08-20 15:17:08 -07:00

index.md

another bad player api link

2013-11-08 09:42:36 -05:00