mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-19 14:36:22 -05:00
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 --61428c82here and54008120on 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:
commit
a96b7584e4