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 1.10 into master #6487

Merged
merged 13 commits into from
Jun 15, 2021
Merged

Merge 1.10 into master #6487

merged 13 commits into from
Jun 15, 2021

Conversation

magik6k
Copy link
Contributor

@magik6k magik6k commented Jun 15, 2021

This is #6482, but with conflicts resolved, and on a different branch so the release one doesn't get auto-closed

@magik6k magik6k enabled auto-merge June 15, 2021 14:55
@magik6k magik6k mentioned this pull request Jun 15, 2021
@magik6k magik6k disabled auto-merge June 15, 2021 15:26
@magik6k magik6k merged commit d763dcf into master Jun 15, 2021
@magik6k magik6k deleted the chore/merge-1.10 branch June 15, 2021 15:26
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