Olga MaciaszekSharma
cbb711c08d
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