mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-06 11:38:24 +00:00
Merge the development line up
Carries the post-release rollover from the development line onto the wire-breaking line, restoring containment. Four conflicts, all of them this branch's own identity against the line below, and all resolved to this side: the package version, the status badge, the roadmap paragraph, and the Unreleased section, whose entries exist only here. Nothing was taken from below. The lower line had opened an empty Unreleased heading, so there was nothing there to carry up, and its version and badge name a release series this branch is not on.
This commit is contained in: