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.

Sign up for GitHub

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

Jump to bottom

chore: update the aes-decrypter #71

Merged
merged 3 commits into from
Apr 2, 2018
Merged

chore: update the aes-decrypter #71

merged 3 commits into from
Apr 2, 2018

Conversation

forbesjo
Copy link
Contributor

@forbesjo forbesjo commented Mar 29, 2018 •
edited

Description

Updating the aes-decrypter to use the rolled up version of the project.

Also bumping up the Qunit test timeout because the playback test sometimes takes longer than 5s

gesinger
gesinger approved these changes Apr 2, 2018
View reviewed changes
Copy link
Contributor

@gesinger gesinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good once tests pass

@forbesjo forbesjo merged commit 27ed914 into videojs:master Apr 2, 2018
@forbesjo forbesjo deleted the update-aes branch April 2, 2018 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gesinger gesinger gesinger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@forbesjo @gesinger