Merge branch 'master' into develop

# Conflicts: # package.json
2016-10-07 15:34:16 -03:00 · 2016-10-07 15:34:16 -03:00 · cd39551a17
parent d6242241da 99a9f2a215
commit cd39551a17
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -70,6 +70,6 @@
 		"start": "run-p watch serve",
 		"reference": "cd node_modules/backstopjs && npm run reference -- --configPath=../../test/visual/backstop.config.js && cd ../../",
 		"compare": "cd node_modules/backstopjs && npm run test -- --configPath=../../test/visual/backstop.config.js && cd ../../",
-		"test": "npm run lint"
+		"test": "run-s build"
 	}
 }