merge: bring master into the Phase 2 branch

master was force-pushed during this work, so the commit the feature branch was
cut from now exists under two SHAs -- 61428c82 here and 54008120 on master, with
identical trees.  That divergence is what shows up as a conflict when this stack
is compared against master, even though PR #588 itself merges cleanly into
feature/custom-theme.

Merging master in here reconciles it inside the PR, so nothing has to be
force-pushed on the shared feature branch.
This commit is contained in:
Roland 2026-07-30 14:08:39 -06:00
commit a96b7584e4
No known key found for this signature in database
GPG key ID: 1BA620CE6C9A4680

Diff content is not available