Skip to content

Commit

Permalink
Update vttjs to fix a trailing comma JSON error
Browse files Browse the repository at this point in the history
closes #2331
  • Loading branch information
gkatsev authored and heff committed Jul 10, 2015
1 parent 70d82a0 commit d5061d7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ CHANGELOG
* @pavelhoral fixed subclassing without a constructor ([view](https://github.com/videojs/video.js/pull/2308))
* @dmlap fixed a vjs_getProperty error caused by a progress check before the swf was ready ([view](https://github.com/videojs/video.js/pull/2316))
* @dmlap exported the videojs.log function ([view](https://github.com/videojs/video.js/pull/2317))
* @gkatsev updated vttjs to fix a trailing comma JSON error ([view](https://github.com/videojs/video.js/pull/2331))

--------------------

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"videojs-font": "1.3.0",
"videojs-ie8": "1.1.0",
"videojs-swf": "4.7.1",
"vtt.js": "git+https://github.com/gkatsev/vtt.js.git#shim-build"
"vtt.js": "git+https://github.com/gkatsev/vtt.js.git#vjs-v0.12.1"
},
"devDependencies": {
"babel": "^5.2.2",
Expand Down

0 comments on commit d5061d7

Please sign in to comment.