Merge branch 'feature/artokai-patch-1' into develop

This commit is contained in:
Michael Rose 2016-04-27 10:44:09 -04:00
commit b33dc25323

View file

@ -37,6 +37,6 @@
"watch:all": "npm-run-all --parallel watch:css watch:js",
"build:css": "npm run scss && npm run autoprefixer",
"build:js": "npm run uglify",
"build:all": "npm run build:css && build:js"
"build:all": "npm run build:css && npm run build:js"
}
}