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 master into feature/media-optimization #168

Merged
merged 2 commits into from
Aug 27, 2021

Conversation

ceaglest
Copy link
Contributor

Make sure the feature branch is up to date with master changes before it gets merged. There were no conflicts so I completed this PR entirely in the Github UI.

Contributing to Twilio

All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.

  • I acknowledge that all my contributions will be made under the project's license.

twilio-product-security and others added 2 commits July 30, 2021 14:56
* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ADDRESSABLE-1316242

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ADDRESSABLE-1316242

* Run pod install

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Tim Rozum <trozum@twilio.com>
@ceaglest ceaglest requested a review from timrozum August 27, 2021 00:22
@@ -176,4 +176,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: f22db36db4545a131be7417d00df2ce176070bc3

COCOAPODS: 1.10.0
COCOAPODS: 1.10.2
Copy link
Contributor Author

Choose a reason for hiding this comment

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

No conflicts since this line was separate from other changes on the feature branch.

@ceaglest
Copy link
Contributor Author

ceaglest commented Aug 27, 2021

CI did not run since there were no new commits. Once we merge this PR we can double check that the CI run on feature/media-optimizations succeeds.

@ceaglest ceaglest merged commit bb16a78 into feature/media-optimization Aug 27, 2021
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.

3 participants