Commit 61e08bae authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'master' into 'master'

Fix the build with cups < 2.2.12

Closes #2968

See merge request !2744
parents 4661f15f 0493e898
Pipeline #224641 passed with stages
in 60 minutes and 2 seconds