Skip to content

Commit

Permalink
Merge branch 'master' into dependencies.io-update-build-408.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Leonya authored Oct 24, 2018
2 parents ee12d3f + 1584289 commit 359869b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
22 changes: 11 additions & 11 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
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
"prop-types": "15.6.2",
"react-markdown": "4.0.3",
"react-sortable-hoc": "0.6.8",
"react-virtualized": "9.20.1",
"react-virtualized": "9.21.0",
"react-waypoint": "8.0.3",
"remark-breaks": "1.0.1",
"sass": "1.14.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/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 packages/gemini/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 packages/generator/app/templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"postcss-cssnext": "3.1.0",
"postcss-import": "12.0.0",
"postcss-import": "12.0.1",
"postcss-loader": "3.0.0",
"postcss-modules-values-replace": "3.0.1",
"prop-types": "15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/package-lock.json

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

0 comments on commit 359869b

Please sign in to comment.