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

Release/12.x #2140

Merged
merged 36 commits into from Feb 3, 2024
Merged

Release/12.x #2140

merged 36 commits into from Feb 3, 2024

Conversation

abetomo
Copy link
Collaborator

@abetomo abetomo commented Feb 3, 2024

bump to 12.0.0

aweebit and others added 30 commits August 5, 2023 11:20
Co-authored-by: John Gee <john@ruru.gen.nz>
Co-authored-by: aweebit <aweebit64@gmail.com>
@abetomo
Copy link
Collaborator Author

abetomo commented Feb 3, 2024

This branch cannot be rebased due to conflicts
Cannot rebase merge to develop.

@shadowspawn shadowspawn merged commit e3192a1 into develop Feb 3, 2024
14 checks passed
@shadowspawn
Copy link
Collaborator

I had already merged from develop to release/12.x, and a rebase would be complicated. But a plain merge is fine and no conflicts.

@abetomo abetomo deleted the release/12.x branch February 3, 2024 09:38
@abetomo
Copy link
Collaborator Author

abetomo commented Feb 3, 2024

Thanks!

@abetomo
Copy link
Collaborator Author

abetomo commented Feb 3, 2024

Released.

@shadowspawn
Copy link
Collaborator

Woop!

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.

None yet

3 participants