Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-08-29 16:02:26 +02:00

View File

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