Skip to content

Commit

Permalink
Merge branch 'master' into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
timneutkens committed May 12, 2018
2 parents 449f38d + 16ff96b commit db29791
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next",
"version": "6.0.1-canary.2",
"version": "6.0.1",
"description": "Minimalistic framework for server-rendered React applications",
"main": "./dist/server/next.js",
"license": "MIT",
Expand Down

0 comments on commit db29791

Please sign in to comment.