chore: sync videojs-contrib-hls updates #75
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
Invalid JavaScript. Semicolon not allowed within object.
* fix(package): update webwackify to version 0.1.6 * chore(package): update lockfile https://npm.im/greenkeeper-lockfile
…#1382) * fix(package): update videojs-contrib-media-sources to version 4.7.2 * chore(package): update lockfile https://npm.im/greenkeeper-lockfile
forbesjo
changed the title
|
This seems to have copies of commits from #35 |
|
That's because their histories have diverged, this PR will still get squashed like 3b52b29 |
gesinger
approved these changes
Apr 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.