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.

Sign up for GitHub

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

Jump to bottom

chore: merge main into next #637

Merged
merged 11 commits into from
Jan 23, 2025
Merged

chore: merge main into next #637

merged 11 commits into from
Jan 23, 2025

Conversation

Mirko-von-Leipzig
Copy link
Contributor

Resolves the merge conflicts of next -> main as requested here.

Changes from main are:

  1. Deployment script changes and deletions
  2. Fixup MSRV 1.82 references from 17028df

Merge resolutions were:

  1. Prefer next readme status
  2. Prefer main deployment script changes

bobbinth
bobbinth approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@bobbinth bobbinth left a comment

Choose a reason for hiding this comment

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

Not a deep review from me - but looks good! Thank you!

@Mirko-von-Leipzig Mirko-von-Leipzig merged commit 6df28b4 into next Jan 23, 2025
10 checks passed
@Mirko-von-Leipzig Mirko-von-Leipzig deleted the mirko/chore/resolve-main-merge branch January 23, 2025 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobbinth bobbinth bobbinth approved these changes

Assignees
No one assigned
Labels
no changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Mirko-von-Leipzig @bobbinth @BrucePolygon @partylikeits1983 @detrina @crStiv