Spencer Gibb 472c7073b9 Merge branch 'master' into Finchley ...

# Conflicts:
#	docs/pom.xml
#	docs/src/main/asciidoc/spring-cloud-starters.adoc
#	pom.xml
#	spring-cloud-dependencies/pom.xml
#	spring-cloud-starter-parent/pom.xml

2017-06-30 09:57:12 -06:00

..

src/main/resources/META-INF

Rename spring-cloud-starter-dependencies -> spring-cloud-dependencies

2016-01-20 09:30:21 +00:00

pom.xml

Merge branch 'master' into Finchley

2017-06-30 09:57:12 -06:00