Olga Maciaszek-Sharma ffb17a4552 Merge remote-tracking branch 'origin/2.2.x' ...

# Conflicts:
#	spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java

2020-10-29 16:54:47 +01:00

..

src/main/asciidoc

Merge remote-tracking branch 'origin/2.2.x'

2020-10-29 16:54:47 +01:00

pom.xml

Going back to snapshots

2020-10-03 13:57:43 +00:00