Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge videojs-contrib-hls master into http-streaming master #35

Merged
merged 7 commits into from Feb 12, 2018

Conversation

gesinger
Copy link
Contributor

Note that we should add cdnjs and jsDelivr CDN availability (then add them to the README)

Requirements Checklist

  • Feature implemented / Bug fixed
  • If necessary, more likely in a feature request than a bug fix
  • Reviewed by Two Core Contributors

gesinger and others added 7 commits January 25, 2018 10:48
* Update karma-chrome-launcher to ^2.2.0

* Update karma to ^1.7.1 and remove firefox from travis configuration

* enable node_modules caching on travis

* Update videojs-contrib-quality-levels to ^2.0.4

* Fix test for event handler cleanup on dispose by calling event handling methods
* Increase karma's browserDisconnectTolerance to 3
@mjneil mjneil merged commit 3b52b29 into videojs:master Feb 12, 2018
@forbesjo
Copy link
Contributor

The ### IE10 and Below note doesn't apply to VHS because it only uses MSE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants