d33ff55 Conflicts: kmail < 16.12

Authored and Committed by Rex Dieter 7 years ago
1 file changed. 7 lines added. 1 lines removed.
    Conflicts: kmail < 16.12
    
        
file modified
+7 -1