Merge branch 'master' into markitup-react

This commit is contained in:
Andrey Okonetchnikov 2016-10-13 13:48:41 +02:00
commit ffe27acc10

View File

@ -22,6 +22,7 @@
"lint-staged": { "lint-staged": {
"*.js": [ "*.js": [
"eslint --fix", "eslint --fix",
"jest --findRelatedTests",
"git add" "git add"
], ],
"*.css": [ "*.css": [
@ -66,8 +67,8 @@
"fsevents": "^1.0.14", "fsevents": "^1.0.14",
"identity-obj-proxy": "^3.0.0", "identity-obj-proxy": "^3.0.0",
"imports-loader": "^0.6.5", "imports-loader": "^0.6.5",
"jest-cli": "^15.1.1", "jest-cli": "^16.0.1",
"lint-staged": "^3.0.3", "lint-staged": "^3.1.0",
"node-sass": "^3.10.0", "node-sass": "^3.10.0",
"npm-check": "^5.2.3", "npm-check": "^5.2.3",
"postcss-cssnext": "^2.7.0", "postcss-cssnext": "^2.7.0",