1
0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00

Merge branch 'stable'

This commit is contained in:
Gary Katsevman 2016-08-16 14:28:25 -04:00
commit d58be409a6
3 changed files with 5 additions and 2 deletions

View File

@ -17,6 +17,9 @@ CHANGELOG
-------------------- --------------------
## 5.11.4 (2016-08-16)
_(none)_
## 5.11.3 (2016-08-15) ## 5.11.3 (2016-08-15)
* @vdeshpande fixed control text for fullscreen button ([view](https://github.com/videojs/video.js/pull/3485)) * @vdeshpande fixed control text for fullscreen button ([view](https://github.com/videojs/video.js/pull/3485))
* @mister-ben fixed android treating swipe as a tap ([view](https://github.com/videojs/video.js/pull/3514)) * @mister-ben fixed android treating swipe as a tap ([view](https://github.com/videojs/video.js/pull/3514))

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.3", "version": "5.11.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.11.3", "version": "5.11.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": [