SpringCloud/spring-cloud-cloudfoundry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Spencer Gibb
2017-11-27 23:21:08 -05:00
parent 9c3cee5f40 3aadc35796
commit 20a31ad0c7
4 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/src/main/asciidoc/README.adoc
View File

@@ -1,6 +1,6 @@
= Spring Cloud for Cloudfoundry
image:https://travis-ci.org/spring-cloud/spring-cloud-cloudfoundry.svg?branch=master["Build Status", link="https://travis-ci.org/spring-cloud/spring-cloud-cloudfoundry"]
image:https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry"]
include::intro.adoc[]
@@ -12,4 +12,4 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste
== Contributing
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]