Merge branch 'master' of github.com:nuxt/nuxt.js

This commit is contained in:
Sebastien Chopin 2017-05-29 17:05:25 +02:00
commit efb9c65248

View File

@ -4,10 +4,13 @@
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)", "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
"contributors": [ "contributors": [
{ {
"name": "Sebastien Chopin" "name": "Sebastien Chopin (@Atinux)"
}, },
{ {
"name": "Alexandre Chopin" "name": "Alexandre Chopin (@alexchopin)"
},
{
"name": "Pooya Parsa (@pi0)"
} }
], ],
"main": "./index.js", "main": "./index.js",