Merge branch '1.2.x'

Browse Source

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

...

This commit is contained in:

Andy Wilkinson

2015-10-02 16:57:21 +01:00

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available