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.md

Fixing broken link with what I think it the correct one

2013-11-08 09:39:29 -05:00

components.md

Close GH-801: API Doc Generation 2. Fixes #747

2013-10-28 18:25:28 -07:00

glossary.md

Close GH-801: API Doc Generation 2. Fixes #747

2013-10-28 18:25:28 -07:00

languages.md

add fix for localization of not supported message

2014-08-20 15:04:30 -07:00

options.md

Close GH-801: API Doc Generation 2. Fixes #747

2013-10-28 18:25:28 -07:00

plugins.md

Close GH-801: API Doc Generation 2. Fixes #747

2013-10-28 18:25:28 -07:00

setup.md

Release 4.7.0

2014-08-05 18:05:38 -07:00

skins.md

Close GH-801: API Doc Generation 2. Fixes #747

2013-10-28 18:25:28 -07:00

tech.md

Close GH-801: API Doc Generation 2. Fixes #747

2013-10-28 18:25:28 -07:00

tracks.md

Fix typo in video tracks documentation

2014-08-16 12:45:31 -04:00