]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ae0075 b893480)
Merge branch 'master' into ipptool 165/head
authorMichael R Sweet <michael.r.sweet@gmail.com>
Thu, 1 Apr 2021 18:11:54 +0000 (14:11 -0400)
committerGitHub <noreply@github.com>
Thu, 1 Apr 2021 18:11:54 +0000 (14:11 -0400)

Trivial merge
Mirror of https://github.com/OpenPrinting/cups.git