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

# Conflicts:
#	docs/src/main/asciidoc/_configprops.adoc
This commit is contained in:
Olga Maciaszek-Sharma
2021-01-14 16:02:02 +01:00
parent a79d82584e
commit 14eb8a7bb1
2 changed files with 2 additions and 2 deletions

View File

@@ -319,4 +319,4 @@ IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply chec
== License
The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/2.2.x/LICENSE.txt[here].
The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here].

View File

@@ -22,4 +22,4 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste
== License
The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/2.2.x/LICENSE.txt[here].
The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here].