Commit d04f3252 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.1.x'

parents cef1ec43 7945b296
......@@ -9,7 +9,7 @@
</parent>
<artifactId>spring-boot-sample-parent-context</artifactId>
<name>spring-boot-sample-parent-context</name>
<description>Spring Boot Integration Sample</description>
<description>Spring Boot Parent Context Sample</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
......
......@@ -9,7 +9,7 @@
</parent>
<artifactId>spring-boot-sample-web-groovy-templates</artifactId>
<name>spring-boot-sample-web-groovy-templates</name>
<description>Spring Boot Web UI Sample</description>
<description>Spring Boot Web Groovy Templates Sample</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
......
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