Olga Maciaszek-Sharma e7932a6aae Merge branch '2.2.x' of https://github.com/cbezmen/spring-cloud-openfeign into cbezmen-2.2.x ...

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

2020-05-11 13:34:03 +02:00

..

src/main/asciidoc

Merge branch '2.2.x' of https://github.com/cbezmen/spring-cloud-openfeign into cbezmen-2.2.x

2020-05-11 13:34:03 +02:00

pom.xml

Updates docs branches

2020-03-06 12:53:34 -05:00