1
0
mirror of https://github.com/videojs/video.js.git synced 2025-03-05 15:16:06 +02:00
Steve Heffernan 9d311640b1 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-06-10 16:59:17 -07:00
..
2013-02-08 17:18:49 -05:00
2014-03-24 17:56:02 -04:00