0712fb8 Merge branch 'master' into epel7

Merged and Committed by loveshack 3 years ago
1 file changed. 13 lines added. 6 lines removed.
    Merge branch 'master' into epel7
    
    Conflicts:
    	blis.spec
    
        
file modified
+13 -6