Merge master into v3-beta.
Showing
| ... | @@ -87,7 +87,7 @@ | ... | @@ -87,7 +87,7 @@ |
| "send": "^0.15.3", | "send": "^0.15.3", | ||
| "source-map-support": "0.4.15", | "source-map-support": "0.4.15", | ||
| "strip-ansi": "3.0.1", | "strip-ansi": "3.0.1", | ||
| "styled-jsx": "1.0.5", | "styled-jsx": "1.0.6", | ||
| "touch": "1.0.0", | "touch": "1.0.0", | ||
| "uglifyjs-webpack-plugin": "0.4.6", | "uglifyjs-webpack-plugin": "0.4.6", | ||
| "unfetch": "2.1.2", | "unfetch": "2.1.2", | ||
| ... | @@ -116,6 +116,7 @@ | ... | @@ -116,6 +116,7 @@ |
| "coveralls": "2.13.1", | "coveralls": "2.13.1", | ||
| "cross-env": "5.0.1", | "cross-env": "5.0.1", | ||
| "express": "4.15.2", | "express": "4.15.2", | ||
| "taskr": "1.0.5", | |||
| "husky": "0.13.3", | "husky": "0.13.3", | ||
| "jest-cli": "20.0.4", | "jest-cli": "20.0.4", | ||
| "lint-staged": "^3.4.0", | "lint-staged": "^3.4.0", | ||
| ... | ... |
This diff is collapsed.
Please
register
or
sign in
to comment