Merge branch 'master' into canary

This commit is contained in:
Tim Neutkens 2018-05-16 00:40:02 +02:00
commit a65839eace

View file

@ -1,6 +1,6 @@
{
"name": "next",
"version": "6.0.2-canary.0",
"version": "6.0.2",
"description": "Minimalistic framework for server-rendered React applications",
"main": "./dist/server/next.js",
"license": "MIT",