Merge the maintenance line up

Browse Source

Carries the maintenance branch's dev-open commit onto the development line,
restoring containment after the release. The version conflict resolves to
this branch's own 0.6.0-dev, which is what a forward merge always does with
a version: each line keeps the one it is building toward.

Nothing else differs. Both branches made the same changelog edit when they
opened, so it merged without a conflict.

...

This commit is contained in:

Johnathan Corgan

2026-08-30 16:02:26 +00:00

parent f1245b6675 79a8b9d0a6

commit 66f0de8ad8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available