Merge branch 'master' into markitup-react

2016-10-13 11:27:53 +02:00 · 2016-10-13 11:27:53 +02:00 · b61b53d15b
commit b61b53d15b
parent 077e83dfc9 e7a4675075
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -5,7 +5,7 @@
  "main": "index.js",
  "scripts": {
    "start": "webpack-dev-server --config webpack.dev.js",
-    "test": "NODE_ENV=test npm run lint && jest",
+    "test": "NODE_ENV=test jest",
    "test:watch": "NODE_ENV=test jest --watch",
    "build": "webpack --config webpack.config.js",
    "storybook": "start-storybook -p 9001",