Olga Maciaszek-Sharma 487390fc20 Merge branch '2.2.x' ...

# Conflicts:
#	spring-cloud-openfeign-core/.flattened-pom.xml
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/.flattened-pom.xml

2020-01-23 15:33:04 +01:00

..

src

Merge branch '2.2.x'

2020-01-23 15:33:04 +01:00

pom.xml

Updates version to 3.0.0.BUILD-SNAPSHOT

2020-01-17 18:58:05 -05:00