Commit 126ab2ab authored by Laurent Heirendt's avatar Laurent Heirendt

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !4
parents 400a8dc2 0cd62357
...@@ -3,20 +3,22 @@ ...@@ -3,20 +3,22 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"grunt": "~0.4.1", "grunt": "^1.0.4",
"grunt-coffeelint": "0.0.7", "grunt-contrib-connect": "^2.0.0",
"grunt-contrib-connect": "~0.5.0", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-copy": "~0.4.1", "grunt-contrib-jshint": "^2.1.0",
"grunt-contrib-jshint": "~0.7.0",
"grunt-contrib-sass": "^1.0.0", "grunt-contrib-sass": "^1.0.0",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "^1.1.0",
"grunt-gh-pages": "~0.9.0", "grunt-gh-pages": "^3.1.0",
"load-grunt-tasks": "~0.2.0" "load-grunt-tasks": "^5.0.0"
}, },
"engines": { "engines": {
"node": ">=0.8.0" "node": ">=0.8.0"
}, },
"scripts": { "scripts": {
"test": "grunt test" "test": "grunt test"
},
"dependencies": {
"generator-reveal": "^1.0.0"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment