Dave Syer 330be01984 Merge branch '1.1.x' ...

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

2014-08-13 08:23:43 -07:00

..

src/main

Merge branch '1.1.x'

2014-08-13 08:23:43 -07:00

pom.xml

Switch master to 1.2.0.BUILD-SNAPSHOT

2014-07-11 10:44:05 +02:00