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 2.x => 3.x #930

Merged
merged 5 commits into from
Jul 30, 2023
Merged

merge 2.x => 3.x #930

merged 5 commits into from
Jul 30, 2023

Conversation

LordSimal
Copy link
Contributor

No description provided.

ndm2 and others added 5 commits May 11, 2023 12:24
Application overrides do not use the `/bake` subdirectory.
Revert template override path change.
2.x: adjust CI to not ignore-platform-reqs
# Conflicts:
#	.github/workflows/ci.yml
@LordSimal LordSimal added this to the 3.x milestone Jul 29, 2023
@markstory markstory merged commit ea9f437 into 3.x Jul 30, 2023
7 checks passed
@markstory markstory deleted the 3.x-merge branch July 30, 2023 00:53
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