Merge branch '2.1.x'

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-openfeign-core/pom.xml
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2019-09-17 15:49:25 +02:00
@@ -1 +0,0 @@
provides: spring-cloud-openfeign-core