Merge branch '1.2.x'

2017-05-08 20:29:11 +01:00
parent e2af638c73 f67bdba5ed
commit 4d4cd17ed2
7 changed files with 131 additions and 56 deletions
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -14,7 +14,7 @@
 	<properties>
        <docs.main>spring-cloud-config</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>1.1.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.3.x</docs.whitelisted.branches>
 	</properties>
 	<build>
 		<plugins>