Commit fe4fbf87 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents d3c13ec4 5efa6370
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
<modules> <modules>
<module>spring-boot-dependencies</module> <module>spring-boot-dependencies</module>
<module>spring-boot-parent</module> <module>spring-boot-parent</module>
<module>spring-boot-test-support</module>
<module>spring-boot-tools</module> <module>spring-boot-tools</module>
<module>spring-boot-test-support</module>
<module>spring-boot</module> <module>spring-boot</module>
<module>spring-boot-test</module> <module>spring-boot-test</module>
<module>spring-boot-autoconfigure</module> <module>spring-boot-autoconfigure</module>
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
<modules> <modules>
<module>spring-boot-dependencies</module> <module>spring-boot-dependencies</module>
<module>spring-boot-parent</module> <module>spring-boot-parent</module>
<module>spring-boot-test-support</module>
<module>spring-boot-tools</module> <module>spring-boot-tools</module>
</modules> </modules>
<build> <build>
......
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