]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Merge branch 'master' into snap-redux
authorMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 6 Oct 2021 15:05:55 +0000 (11:05 -0400)
committerGitHub <noreply@github.com>
Wed, 6 Oct 2021 15:05:55 +0000 (11:05 -0400)

Trivial merge