Stephane Nicoll 8c8fce5b0f Merge branch '1.2.x' ...

Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

2015-06-08 15:18:45 +02:00

..

src/main

Merge branch '1.2.x'

2015-06-08 15:18:45 +02:00

pom.xml

Next Development Version

2015-06-04 00:49:11 -07:00