Merge remote-tracking branch 'origin/2.2.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
2020-03-20 20:05:09 +01:00
parent 6b9be3f513
commit 90181f34c0

View File

@@ -517,7 +517,7 @@ public interface DemoTemplate {
}
----
=== Spring MatrixVariable Support
=== Spring @MatrixVariable Support
Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation.