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 branch '7.1' into 7 #863

Merged

Conversation

GuySartorelli
Copy link
Contributor

I don't have access to push this merge commit - and the github action for automatically merging won't run until the October minor release. When that happens, it'll be looking at the new 7.2 branch, not the 7.1 branch. So we need to merge this ahead of time.

I'm doing it now because I'm doing a card that's all about merge-ups - we may need to do it again closer to release as well.

Issue

@emteknetnz emteknetnz merged commit 411c1e2 into tractorcow-farm:7 Jun 11, 2024
10 checks passed
@emteknetnz emteknetnz deleted the pulls/7/merge-from-7.1 branch June 11, 2024 04:30
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