Skip to content

Commit

Permalink
Merge branch 'videojs:main' into feat/audioOnlyModes
Browse files Browse the repository at this point in the history
  • Loading branch information
harisha-swaminathan authored Mar 15, 2022
2 parents 2f17c4a + b275a15 commit b7e4e4e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 35 deletions.
49 changes: 15 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@videojs/http-streaming": "2.13.1",
"@videojs/http-streaming": "2.14.0",
"@videojs/vhs-utils": "^3.0.4",
"@videojs/xhr": "2.6.0",
"aes-decrypter": "3.1.2",
Expand Down

0 comments on commit b7e4e4e

Please sign in to comment.