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

chore(merge): '1.20.3' into 'main' #552

Merged
merged 4 commits into from
Apr 12, 2024
Merged

chore(merge): '1.20.3' into 'main' #552

merged 4 commits into from
Apr 12, 2024

Conversation

mr-cal
Copy link
Collaborator

@mr-cal mr-cal commented Apr 11, 2024

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run tox?

@mr-cal mr-cal changed the title chore(merge): 'merge/1.20' into 'main' chore(merge): '1.20.3' into 'main' Apr 11, 2024
@mr-cal mr-cal requested a review from lengau April 11, 2024 19:45
@mr-cal mr-cal requested a review from syu-w April 11, 2024 20:08
@mr-cal
Copy link
Collaborator Author

mr-cal commented Apr 12, 2024

Sorry for the force-push, #553 needed to land on main first and I couldn't do a rebase update

@mr-cal
Copy link
Collaborator Author

mr-cal commented Apr 12, 2024

Another PR just landed on main, hence another force push

@lengau lengau enabled auto-merge (squash) April 12, 2024 21:24
@lengau lengau merged commit eea1f62 into main Apr 12, 2024
13 checks passed
@lengau lengau deleted the merge/1.20 branch April 12, 2024 21:42
lengau added a commit that referenced this pull request Apr 12, 2024
This reverts commit eea1f62.

I messed up and squash-merged instead of doing a real merge
@lengau lengau restored the merge/1.20 branch April 12, 2024 21:52
lengau added a commit that referenced this pull request Apr 12, 2024
This reverts commit eea1f62.

I messed up and squash-merged instead of doing a real merge
@mr-cal mr-cal deleted the merge/1.20 branch April 12, 2024 23:19
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