1
0
mirror of https://github.com/videojs/video.js.git synced 2025-03-25 22:01:11 +02:00
Steve Heffernan a64a5e27cf 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-03-06 13:18:49 -08:00
..
2014-03-06 13:18:49 -08:00