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

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

2020-05-11 13:39:15 +02:00

..

src

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

2020-05-11 13:39:15 +02:00

pom.xml

Bumping versions

2020-04-17 02:55:34 +00:00