1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-29 02:57:21 +02:00

Merge branch 'stable'

This commit is contained in:
Gary Katsevman 2016-08-09 11:24:23 -04:00
commit c15d64adf5
3 changed files with 5 additions and 2 deletions

View File

@ -10,6 +10,9 @@ CHANGELOG
-------------------- --------------------
## 5.11.2 (2016-08-09)
_(none)_
## 5.11.1 (2016-08-08) ## 5.11.1 (2016-08-08)
* @vxsx fixed legend selector to be more specific. Fixes #3492 ([view](https://github.com/videojs/video.js/pull/3494)) * @vxsx fixed legend selector to be more specific. Fixes #3492 ([view](https://github.com/videojs/video.js/pull/3494))

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.11.1", "version": "5.11.2",
"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.11.1", "version": "5.11.2",
"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": [