Merge branch 'master' into fix-italic-spelling

BurkusCat · web-flow · commit a4d7309ebc20 · 2020-01-31T22:29:16.000Z
diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.0.0-build.{height}",
+  "version": "6.1.0-build.{height}",
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
     "^refs/heads/dev$", // we release out of dev

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "6.0.0-build.{height}",`
	`2`	`+ "version": "6.1.0-build.{height}",`
`3`	`3`	`"publicReleaseRefSpec": [`
`4`	`4`	`"^refs/heads/master$", // we release out of master`
`5`	`5`	`"^refs/heads/dev$", // we release out of dev`