Andy Wilkinson 7d1606dcfa Merge branch '1.1.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-11-11 10:13:51 +00:00

..

src

Merge branch '1.1.x'

2014-11-11 10:13:51 +00:00

pom.xml

Use the Mongo starter for the sample application

2014-11-05 07:47:25 -08:00