Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
josdejong committed Dec 16, 2019
2 parents 7c3695d + 1f02eda commit 036c9e1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions examples/react_advanced_demo/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 examples/react_advanced_demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"jsoneditor": "^7.4.0",
"jsoneditor": "^8.0.0",
"lodash": "4.17.15",
"react": "16.12.0",
"react-dom": "16.12.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/react_demo/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 examples/react_demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"jsoneditor": "^7.4.0",
"jsoneditor": "^8.0.0",
"react": "16.12.0",
"react-dom": "16.12.0",
"react-scripts": "3.3.0"
Expand Down

0 comments on commit 036c9e1

Please sign in to comment.