Skip to content

Commit

Permalink
Merge branch 'dev' into forgot-decorator
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcjohnson authored Oct 29, 2020
2 parents 22e3a50 + d711f61 commit 646f4f7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#1442](https://github.com/plotly/dash/pull/1442) Update from React 16.13.0 to 16.14.0
### Fixed
- [#1434](https://github.com/plotly/dash/pull/1434) Fix [#1432](https://github.com/plotly/dash/issues/1432) for Julia to import non-core component packages without possible errors.

Expand Down
20 changes: 10 additions & 10 deletions dash-renderer/package-lock.json

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

4 changes: 2 additions & 2 deletions dash-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"prop-types": "15.7.2",
"radium": "^0.26.0",
"ramda": "^0.27.0",
"react": "16.13.0",
"react": "16.14.0",
"react-cytoscapejs": "^1.2.1",
"react-dom": "16.13.0",
"react-dom": "16.14.0",
"react-json-tree": "^0.11.2",
"react-redux": "^7.2.0",
"redux": "^4.0.5",
Expand Down

0 comments on commit 646f4f7

Please sign in to comment.