Skip to content

Syncing content from master

David Diederich requested to merge sync-master-to-release-0.20 into release/0.20

This is a direct patch to release/0.20, with no corresponding MR targeting master.

The branch structure for this repository is unmitigated chaos, and the cherry-picks are hard to disentangle. There's a theory floating around that master has the right code, so this sets the release branch to match the code exactly, but for no particular reason.

Performed using git checkout master -- ., then skippnig the couple of release branch differences in .gitlab-ci.yml

master was c209cff2 at the time of this commit.

Merge request reports