Merge branch 'master' into style-changes-bulletfactory

This commit is contained in:
Torkel Ödegaard
2016-02-12 10:14:06 +01:00
12 changed files with 85 additions and 46 deletions

View File

@@ -60,8 +60,7 @@
},
"scripts": {
"test": "grunt test",
"coveralls": "grunt karma:coveralls && rm -rf ./coverage",
"postinstall": "./node_modules/.bin/grunt copy:node_modules"
"coveralls": "grunt karma:coveralls && rm -rf ./coverage"
},
"license": "Apache-2.0",
"dependencies": {