Stephane Nicoll cce498b530 Merge branch '1.2.x' ...

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

2015-11-05 14:11:15 +01:00

..

src/main

Merge branch '1.2.x'

2015-11-05 14:11:15 +01:00

pom.xml

Next Development Version

2015-10-16 05:57:24 -07:00