Skip to content

Commit cbb711c

Browse files
committed
Merge remote-tracking branch 'origin/3.1.x' into 4.0.x
# Conflicts: # README.adoc # docs/pom.xml # docs/src/main/asciidoc/README.adoc # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/Invoices.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/EqualsAndHashCodeAssert.java # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml
2 parents 31201de + 835b9b5 commit cbb711c

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

README.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/ba
99

1010
image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/4.0.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/4.0.x"]
1111

12-
image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
13-
1412
:doctype: book
1513
:idprefix:
1614
:idseparator: -

docs/src/main/asciidoc/README.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/ba
22

33
image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/4.0.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/4.0.x"]
44

5-
image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
6-
75
include::_attributes.adoc[]
86

97
include::intro.adoc[]

0 commit comments

Comments
 (0)