Merge branch 'master' into canary

timneutkens · timneutkens · commit da0c7a9ce650 · 2018-06-28T20:57:39.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.4-canary.9",
+  "version": "6.1.0",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "next",`
`3`		`- "version": "6.0.4-canary.9",`
	`3`	`+ "version": "6.1.0",`
`4`	`4`	`"description": "Minimalistic framework for server-rendered React applications",`
`5`	`5`	`"main": "./dist/server/next.js",`
`6`	`6`	`"license": "MIT",`