Commit f3ebd71b authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x'

Closes gh-16967
parents ead0cd91 5a5b5a0d
......@@ -9,8 +9,8 @@
</parent>
<artifactId>spring-boot-project</artifactId>
<packaging>pom</packaging>
<name>Spring Boot Build</name>
<description>Spring Boot Build</description>
<name>Spring Boot Project</name>
<description>Spring Boot Project</description>
<properties>
<main.basedir>${basedir}/..</main.basedir>
</properties>
......
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