Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/react-dom-16.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
gvn committed Aug 28, 2018
2 parents 5060033 + e82a55d commit 31ac7fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -40,7 +40,7 @@
"ajv-cli": "^2.1.0",
"autoprefixer": "^7.2.6",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.4",
"babel-loader": "^7.1.5",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"browserslist": "^2.11.3",
Expand Down

0 comments on commit 31ac7fc

Please sign in to comment.