web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-04-09 07:23:57 +02:00
Code Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Gary Katsevman 2015-10-20 14:00:48 -04:00
commit 1834d39c2f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ CHANGELOG
## HEAD (Unreleased)
* @imbcmdth fixed an issue with emulateTextTracks being called before the tech dom was ready ([view](https://github.com/videojs/video.js/pull/2692))
* @typcn bumped grunt-sass to ^1.0.0 to support node 4.x ([view](https://github.com/videojs/video.js/pull/2645))
* @gkatsev bumped obj.assign to fix uncaught SecurityError in iframes. Fixes #2703 ([view](https://github.com/videojs/video.js/pull/2721))
--------------------

2
package.json
View File

@ -25,7 +25,7 @@
"dependencies": {
"global": "^4.3.0",
"lodash-compat": "^3.9.3",
"object.assign": "^2.0.1",
"object.assign": "^4.0.1",
"safe-json-parse": "^4.0.0",
"tsml": "1.0.1",
"videojs-font": "1.3.0",