spring-boot/spring-boot-dependencies
Andy Wilkinson 9f0654bd77 Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-04 17:55:20 +00:00
..
pom.xml Merge branch '1.1.x' into 1.2.x 2015-03-04 17:55:20 +00:00