Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/react-i18next-6.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
dnlkoch committed Oct 4, 2017
2 parents 74c2f80 + b290381 commit 6fd3680
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 @@ -123,7 +123,7 @@
"react-test-renderer": "16.0.0",
"rimraf": "2.6.2",
"sinon": "4.0.0",
"style-loader": "0.18.2",
"style-loader": "0.19.0",
"url-loader": "0.5.9",
"webpack": "3.6.0",
"webpack-dev-server": "2.9.0",
Expand Down

0 comments on commit 6fd3680

Please sign in to comment.