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

Merge branch '1.2.x'

Browse Source 
# Conflicts:
#	docs/pom.xml
This commit is contained in:
Spencer Gibb
2017-11-28 12:51:21 -05:00
parent 5c05cb5116 4d906499b1
commit a186829882
1 changed files with 1 additions and 1 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-zookeeper</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<docs.whitelisted.branches>1.0.x,1.1.x,2.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.0.x,1.1.x,1.2.x</docs.whitelisted.branches>
</properties>
<profiles>
<profile>