Skip to content

S
spring-boot
Commit 3553e1d8 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.2.x' 

Conflicts:
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/velocity/VelocityAutoConfiguration.java
parents 2b748a7b 8978f54c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment