Merge branch '1.2.x'

Browse Source

Conflicts:
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/velocity/VelocityAutoConfiguration.java

pull/4077/merge

Andy Wilkinson 9 years ago

parent 2b748a7b44 8978f54cc3

commit 3553e1d825

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available