1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-19 10:54:16 +02:00
heff 2489cc1c10 Merge branch 'stable'
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.dev.js
	dist/video-js/video.js
2015-01-23 10:50:49 -08:00
..
2014-09-02 12:39:08 -07:00
2014-09-05 13:32:15 -07:00
2014-06-13 13:41:23 -07:00