Commit 064cb709 authored by Marco Martin's avatar Marco Martin

Merge branch 'nicolasfella/plasma-settings-rewrite'

parents 2e54d0ba c0b57835
Pipeline #5100 passed with stage
in 11 minutes and 50 seconds