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

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-29 15:46:20 +02:00
parent f412768f55 8ce23984fe
commit b1a79ce2bc
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -17,3 +17,4 @@ _site/
.idea
.factorypath
/spring-cloud-release-tools*.jar
antrun

2
docs/pom.xml
View File

@@ -14,7 +14,7 @@
<properties>
<docs.main>spring-cloud-commons</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<docs.whitelisted.branches>1.0.x,2.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.0.x,1.2.x,2.0.x</docs.whitelisted.branches>
</properties>
<build>
<plugins>