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