[VBLOCKS-2797] Merge from main into user defined messages - Githubissues

twilio / twilio-voice-react-native

Other

62 stars 22 forks source link

[VBLOCKS-2797] Merge from main into user defined messages #335

Closed mhuynh5757 closed 4 months ago

mhuynh5757 commented 4 months ago

Submission Checklist

[x] ~Updated the CHANGELOG.md to reflect any feature, bug fixes, or known issues made in the source code~
[x] Tested code changes and observed expected behavior in the example app
[x] Performed a visual inspection of the Files changed tab prior to submitting the pull request for review to ensure proper usage of the style guide

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.

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

Description

This PR merges main using git merge -Xours main into the feature branch to resolve merge conflicts (again!).

Breakdown

git merge -Xours main

Validation

CI runs and succeeds.

Additional Notes

N/A