spring-boot/spring-boot-dependencies
Andy Wilkinson d428afb45f Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 16:32:05 +00:00
..
pom.xml Merge branch '1.1.x' into 1.2.x 2015-03-26 16:32:05 +00:00