Skip to content

Commit

Permalink
Merge branch 'v2.x/staging' into dependabot/npm_and_yarn/system-apps/…
Browse files Browse the repository at this point in the history
…system-settings-preferences/webClient/browserify-sign-4.2.2
  • Loading branch information
timgerstel authored Dec 11, 2023
2 parents 88bf010 + 50dd455 commit ebc02a5
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 21 deletions.
30 changes: 18 additions & 12 deletions system-apps/app-generator/webClient/package-lock.json

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

35 changes: 26 additions & 9 deletions system-apps/app-prop-viewer/webClient/package-lock.json

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

0 comments on commit ebc02a5

Please sign in to comment.