Merge branch 'Finchley.M1' into Finchley

# Conflicts:
#	spring-cloud-dependencies/pom.xml
This commit is contained in:
Spencer Gibb
2017-07-06 10:33:37 -06:00
3 changed files with 5 additions and 5 deletions

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-build</artifactId>
<version>Finchley.BUILD-SNAPSHOT</version>
<version>Finchley.M1</version>
</parent>
<packaging>pom</packaging>
<name>Spring Cloud Starter Docs</name>