Skip to content

Commit

Permalink
Merge branch 'develop' into docs/cloudinary-https
Browse files Browse the repository at this point in the history
  • Loading branch information
bobylito committed Jun 5, 2017
2 parents a8eb855 + d4bb3fa commit 4ea3990
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.10.0
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
language: node_js
node_js: stable
addons:
apt:
sources:
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ A note about the branches used in this project:
You should do the dev and PR according to the target version. No new features
will be done on the maintenance version.

### Requirements

To run this project, you will need:

- Node.js >= v7.10.0 and <= 8, use nvm - [install instructions](https://github.com/creationix/nvm#install-script)

## Development

```sh
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
"dist",
"dist-es5-module"
],
"engines": {
"node": "7.10.0"
},
"devDependencies": {
"autoprefixer": "^6.7.6",
"babel-cli": "^6.23.0",
Expand Down

0 comments on commit 4ea3990

Please sign in to comment.