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

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-openfeign-core/pom.xml
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/pom.xml

2020-09-16 13:01:34 +02:00

..

src/main/asciidoc

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

2020-09-16 13:01:34 +02:00

pom.xml

Bumping versions to 2.2.6.BUILD-SNAPSHOT after release

2020-08-28 20:04:40 +00:00