Browse Source

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
pull/227/head
Olga Maciaszek-Sharma 5 years ago
parent
commit
9dfc820306
  1. 1
      spring-cloud-starter-openfeign/src/main/resources/META-INF/spring.provides

1
spring-cloud-starter-openfeign/src/main/resources/META-INF/spring.provides

@ -1 +0,0 @@ @@ -1 +0,0 @@
provides: spring-cloud-openfeign-core
Loading…
Cancel
Save