Merge branch 'master' into 0.9.10

This commit is contained in:
Sébastien Chopin 2017-02-28 13:11:46 +01:00
commit c0518f7c88
3 changed files with 6 additions and 1 deletions

View File

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2016 Sebastien Chopin ([@Atinux](https://github.com/Atinux)) & Alexandre Chopin ([@alexchopin](https://github.com/alexchopin))
Copyright (c) 2016-2017 Sebastien Chopin ([@Atinux](https://github.com/Atinux)) & Alexandre Chopin ([@alexchopin](https://github.com/alexchopin))
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@ -79,6 +79,7 @@ Learn more at [nuxtjs.org](https://nuxtjs.org).
You can start by using one of our starter templates:
- [starter](https://github.com/nuxt/starter): Basic Nuxt.js project template
- [express](https://github.com/nuxt/express): Nuxt.js + Express
- [koa](https://github.com/nuxt/koa): Nuxt.js + Koa
- [adonuxt](https://github.com/nuxt/adonuxt): Nuxt.js + AdonisJS
## Using nuxt.js programmatically

View File

@ -46,6 +46,10 @@
"precommit": "npm run lint",
"prepublish": "npm run build"
},
"engines": {
"node": ">=4.3.0 <5.0.0 || >=5.10",
"npm": ">=3.0.0"
},
"dependencies": {
"ansi-html": "^0.0.7",
"autoprefixer": "^6.7.2",