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 master back into develop following v9.3.0 release #6935

Merged
merged 6 commits into from
Apr 4, 2023

Conversation

BeksOmega
Copy link
Collaborator

The details

Update develop with changes on master. Looks like there were no changes directly to master this quarter, so this is just to update the version number.

@BeksOmega BeksOmega requested a review from cpcallen March 29, 2023 18:07
@BeksOmega BeksOmega requested a review from a team as a code owner March 29, 2023 18:07
@github-actions github-actions bot added the PR: chore General chores (dependencies, typos, etc) label Mar 29, 2023
maribethb and others added 3 commits March 30, 2023 20:44
* fix: allow splicing into shadow block stacks

* chore: format

(cherry picked from commit 69afe5b)
Copy link
Contributor

@cpcallen cpcallen left a comment

Choose a reason for hiding this comment

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

I was sure I had already approved this but evidently I did not.

Out of curiosity: was it just for expediency that the unmovable shadow block fix got merged directly into master rather than being cherry-picked via develop?

@BeksOmega
Copy link
Collaborator Author

It did get cherry picked via develop: #6939

@BeksOmega BeksOmega merged commit 2bf456d into develop Apr 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: chore General chores (dependencies, typos, etc)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants