SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
# Conflicts:
#	pom.xml
#	spring-cloud-openfeign-dependencies/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2019-04-02 18:00:43 +02:00
parent f6fee55411 35ec2913d9
commit aba2abba8a
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -15,7 +15,7 @@
<properties>
<docs.main>spring-cloud-openfeign</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<docs.whitelisted.branches>2.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>2.0.x,2.1.x</docs.whitelisted.branches>
</properties>
<build>
<plugins>