Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/monorepo.react-16.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
visusnet committed Nov 19, 2018
2 parents 563c8a4 + 04d2de5 commit f3e8a97
Show file tree
Hide file tree
Showing 2 changed files with 937 additions and 29 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"@types/jest": "^23.3.0",
"@types/react": "16.4",
"@types/react": "~16.7.0",
"@types/react-dom": "^16.0.6",
"babel-cli": "^6.26.0",
"babel-eslint": "^9.0.0",
Expand All @@ -42,7 +42,7 @@
"eslint-plugin-react": "^7.6.0",
"flow-bin": "^0.80.0",
"jest": "^23.4.1",
"jsdom": "^12.0.0",
"jsdom": "^13.0.0",
"node-sass-chokidar": "^1.3.3",
"raf": "^3.4.0"
},
Expand Down

0 comments on commit f3e8a97

Please sign in to comment.