Skip to content

Commit 3553e1d

Browse files
wilkinsonawilkinsona
committed
Merge branch '1.2.x'
Conflicts: spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/velocity/VelocityAutoConfiguration.java
2 parents 2b748a7 + 8978f54 commit 3553e1d

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)