Merge branch 'v1.6'

AArnott · AArnott · commit 9960c94ded68 · 2018-11-25T11:14:57.000-08:00
diff --git a/src/version.json b/src/version.json
@@ -6,6 +6,6 @@
   },
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
-    "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N
+    "^refs/heads/v\\d+\\.\\d+$" // we also release vX.Y branches
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`},`
`7`	`7`	`"publicReleaseRefSpec": [`
`8`	`8`	`"^refs/heads/master$", // we release out of master`
`9`		`- "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N`
	`9`	`+ "^refs/heads/v\\d+\\.\\d+$" // we also release vX.Y branches`
`10`	`10`	`]`
`11`	`11`	`}`