Commit 18cfe1b1 by Torkel Ödegaard

Merge branch 'master' of github.com:grafana/grafana

parents f6100dd8 ee4bbf61
......@@ -53,10 +53,6 @@
"systemjs": "0.19.41",
"zone.js": "^0.7.2"
},
"engines": {
"node": "4.x",
"npm": "2.14.x"
},
"scripts": {
"build": "./node_modules/grunt-cli/bin/grunt",
"test": "./node_modules/grunt-cli/bin/grunt test",
......
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