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

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

2021-01-26 10:03:04 +01:00

..

src/main/asciidoc

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

2021-01-26 10:03:04 +01:00

pom.xml

Bumping versions to 3.0.1-SNAPSHOT after release

2020-12-21 19:45:02 +00:00