4e3a03e Conflicts: kdepim-addons < 16.07

Authored and Committed by Rex Dieter 7 years ago
    Conflicts: kdepim-addons < 16.07
    
        
file modified
+4 -1