8d3a98e Merge branch 'master' of ssh://pkgs.fedoraproject.org/flexdock

Merged and Committed by Clément DAVID 10 years ago
1 file changed. 18 lines added. 15 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/flexdock
    
    Conflicts:
    	flexdock.spec
    
        
file modified
+18 -15