Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into patch-1
  • Loading branch information
gaearon authored Aug 28, 2017
commit b55e5e3641b0a81b8bb9b0e2604f9bda04250255
4 changes: 3 additions & 1 deletion packages/react-error-overlay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
"anser": "1.4.1",
"babel-code-frame": "6.22.0",
"babel-runtime": "6.26.0",
"react-dev-utils": "^3.1.0",
"html-entities": "1.2.1",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"settle-promise": "1.0.0",
"source-map": "0.5.6"
},
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.