Skip to content

Commit 4246c3c

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into greenkeeper-react-dom-0.14.7
# Conflicts: # package.json
2 parents 2f5aaaf + 8461d0f commit 4246c3c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727
"babel-preset-es2015": "^6.3.13",
2828
"babel-preset-react": "^6.3.13",
2929
"babel-preset-stage-0": "^6.3.13",
30-
"express": "^4.13.3",
30+
"express": "^4.13.4",
3131
"react-transform-catch-errors": "^1.0.1",
3232
"react-transform-hmr": "^1.0.1",
3333
"redbox-react": "^1.2.0",
3434
"rimraf": "^2.5.0",
35-
"tslint": "^3.2.1",
35+
"tslint": "^3.3.0",
3636
"tslint-loader": "^2.1.0",
37-
"webpack": "^1.12.11",
37+
"webpack": "^1.12.12",
3838
"webpack-dev-middleware": "^1.4.0",
3939
"webpack-hot-middleware": "^2.6.4"
4040
},
4141
"dependencies": {
42-
"react": "^0.14.6",
42+
"react": "^0.14.7",
4343
"react-dom": "^0.14.7",
44-
"react-redux": "^4.0.6",
45-
"redux": "^3.0.5",
46-
"ts-loader": "^0.7.2",
44+
"react-redux": "^4.1.2",
45+
"redux": "^3.1.5",
46+
"ts-loader": "^0.8.0",
4747
"typescript": "^1.7.5"
4848
}
4949
}

0 commit comments

Comments
 (0)