1
0
mirror of https://github.com/videojs/video.js.git synced 2025-02-04 11:43:27 +02:00
Steve Heffernan 9dc4ed29f2 Merge branch 'stable'
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.less
	dist/video-js/video-js.min.css
	dist/video-js/video.dev.js
	dist/video-js/video.js
2014-09-05 14:59:25 -07:00
..
2014-09-05 14:58:12 -07:00