Merge branch 'master' into markitup-react

This commit is contained in:
Andrey Okonetchnikov 2016-10-13 11:27:53 +02:00
commit b61b53d15b

View File

@ -5,7 +5,7 @@
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "webpack-dev-server --config webpack.dev.js", "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", "test:watch": "NODE_ENV=test jest --watch",
"build": "webpack --config webpack.config.js", "build": "webpack --config webpack.config.js",
"storybook": "start-storybook -p 9001", "storybook": "start-storybook -p 9001",