Skip to content

Conversation

@matbcvo
Copy link
Contributor

@matbcvo matbcvo commented Sep 11, 2025

This PR merges changes from the 5.2 branch into the 6.0 branch. No merge conflicts occurred.

Previous PR had the base branch set to 5.2 instead of 6.0.

RCheesley and others added 26 commits June 5, 2025 11:45
Remove update command from 5.2 docs
Add Sphinx setup and virtualenv for documentation build support
@matbcvo matbcvo marked this pull request as ready for review September 11, 2025 21:30
Copy link
Member

@RCheesley RCheesley left a comment

Choose a reason for hiding this comment

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

This is OK with me, the changes do seem to be those which were made recently since we made the branch to 6.

@RCheesley RCheesley merged commit 792fd1d into 6.0 Sep 11, 2025
2 of 5 checks passed
@matbcvo matbcvo deleted the backmerge-5.2-into-6.0 branch September 11, 2025 21:38
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.

9 participants