]> source.dussan.org Git - archiva.git/commitdiff
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/archiva
authorMartin Stockhammer <martin.stockhammer@ars.de>
Fri, 10 Nov 2017 23:10:29 +0000 (00:10 +0100)
committerMartin Stockhammer <martin.stockhammer@ars.de>
Fri, 10 Nov 2017 23:10:29 +0000 (00:10 +0100)
1  2 
pom.xml

diff --cc pom.xml
Simple merge