Merge branch 'develop' of github.com:josdejong/jsoneditor into develop

# Conflicts: # package-lock.json # package.json
josdejong · May 12, 2023 · e6c8a73 · e6c8a73
2 parents f8ca8ae + d0df2f4
commit e6c8a73
Show file tree

Hide file tree

Showing 4 changed files with 634 additions and 412 deletions.
diff --git a/examples/react_advanced_demo/package-lock.json b/examples/react_advanced_demo/package-lock.json
diff --git a/examples/react_demo/package-lock.json b/examples/react_demo/package-lock.json