5dc23e Merge remote-tracking branch 'origin/SLE15-SP4' into SLE15-SP5

Merged and Committed by Michal Koutný 7 months ago
    Merge remote-tracking branch 'origin/SLE15-SP4' into SLE15-SP5
    
    Conflicts:
    	series.conf: mergetool
    
        
file modified
+1 -0