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

# Conflicts:
#	spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java

2021-02-08 18:40:33 +01:00

..

src

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

2021-02-08 18:40:33 +01:00

pom.xml

Bumping versions to 3.0.2-SNAPSHOT after release

2021-01-27 20:52:26 +00:00