spring-boot/spring-boot-dependencies
Andy Wilkinson 741d1f7273 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-10-28 19:15:58 +00:00
..
pom.xml Merge branch '1.1.x' 2014-10-28 19:15:58 +00:00