Dave Syer ff8a4d0f9d Merge branch '1.0.x' ...

Conflicts: MessageSourceAutoConfiguration.java

2015-08-21 17:13:19 +01: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.0.x'

2015-08-21 17:13:19 +01:00