Phillip Webb 6281070d0a Merge branch '1.1.x' ...

Conflicts:
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

2014-10-09 13:00:27 -07:00

..

src/main

Merge branch '1.1.x'

2014-10-09 13:00:27 -07:00

pom.xml

Fix asciidoctor syntax problems and updgrade to asciidoctor 1.5

2014-10-09 10:58:06 +01:00