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 👉🏻 5.x TEDU-140 #214

Closed
wants to merge 116 commits into from
Closed

Merge main 👉🏻 5.x TEDU-140 #214

wants to merge 116 commits into from

Conversation

RCheesley
Copy link
Member

We need to push the latest changes from the main branch over to 5.x.

Trying to do this from my own fork to make it easier to resolve conflicts without breaking the world 🤯

favour-chibueze and others added 30 commits August 25, 2022 06:16
Amiyah14 and others added 27 commits September 5, 2023 16:34
Co-authored-by: Ruth Cheesley <[email protected]>
Co-authored-by: Ruth Cheesley <[email protected]>
Add information on the branch to fork
@RCheesley RCheesley marked this pull request as ready for review November 21, 2023 20:23
@RCheesley
Copy link
Member Author

Ooof, finally fixed many conflicts and we should be OK to merge now. I'll make a separate PR with the vale fixes.

@RCheesley RCheesley closed this Nov 21, 2023
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.

5 participants