Phillip Webb df1d035162 Merge branch '1.1.x' ...

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

2014-11-05 16:51:33 -08:00

..

src/main

Merge branch '1.1.x'

2014-11-05 16:51:33 -08:00

pom.xml

Next development version

2014-10-10 15:19:47 -07:00