Merge branch '1.1.x' into 1.2.x

Conflicts:
	spring-boot-dependencies/pom.xml
pull/2707/merge
Andy Wilkinson 10 years ago
commit 40fd0dce3c

Diff Content Not Available