Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x ...

# Conflicts:
#	spring-boot-dependencies/pom.xml

2016-10-04 13:01:46 +02:00

..

src/main/xslt

Support bom-based dependency management in the CLI

2015-05-07 14:58:23 +01:00

pom.xml

Merge branch '1.4.x' into 1.5.x

2016-10-04 13:01:46 +02:00