1
0
mirror of https://github.com/videojs/video.js.git synced 2024-11-24 08:42:25 +02:00

Merge branch 'stable'

This commit is contained in:
Gary Katsevman 2016-05-31 15:39:19 -04:00
commit 11d379cbce
3 changed files with 5 additions and 2 deletions

View File

@ -14,6 +14,9 @@ CHANGELOG
-------------------- --------------------
## 5.10.4 (2016-05-31)
* Patch release to fix dist on npm
## 5.10.3 (2016-05-27) ## 5.10.3 (2016-05-27)
* @BrandonOCasey fixed source handlers being disposed multiple times when a video is put into the video element directly ([view](https://github.com/videojs/video.js/pull/3343)) * @BrandonOCasey fixed source handlers being disposed multiple times when a video is put into the video element directly ([view](https://github.com/videojs/video.js/pull/3343))

View File

@ -1,7 +1,7 @@
{ {
"name": "video.js", "name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.", "description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "5.10.3", "version": "5.10.4",
"keywords": [ "keywords": [
"videojs", "videojs",
"html5", "html5",

View File

@ -1,7 +1,7 @@
{ {
"name": "video.js", "name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.", "description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "5.10.3", "version": "5.10.4",
"copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>", "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
"license": "Apache-2.0", "license": "Apache-2.0",
"keywords": [ "keywords": [