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 main into next #3456

Merged
merged 20 commits into from
Feb 25, 2025
Merged

Merge main into next #3456

merged 20 commits into from
Feb 25, 2025

Conversation

vivid-planet-bot
Copy link
Collaborator

@vivid-planet-bot vivid-planet-bot commented Feb 18, 2025

This is an automated pull request to merge changes from main into next. It has merge conflicts. To resolve conflicts, check out the branch merge-main-into-next locally, make any necessary changes to conflicting files, and commit and publish your changes.

@vivid-planet-bot vivid-planet-bot changed the title Merge main into next [Conflicts] Merge main into next Feb 18, 2025
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
@thomasdax98 thomasdax98 changed the title [Conflicts] Merge main into next Merge main into next Feb 24, 2025
@johnnyomair johnnyomair merged commit 1fd7624 into next Feb 25, 2025
12 checks passed
@johnnyomair johnnyomair deleted the merge-main-into-next branch February 25, 2025 07:03
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.

6 participants