Skip to content

Commit

Permalink
Merge remote-tracking branch 'Companion/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock -> serialize-javascript@^6.0.1
  • Loading branch information
Luuccc committed Feb 15, 2025
2 parents d581018 + 01da86a commit 4cb30f8
Show file tree
Hide file tree
Showing 2 changed files with 2,350 additions and 4 deletions.
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1987,10 +1987,10 @@ semver@^7.0.0, semver@^7.3.7, semver@^7.5.0:
dependencies:
lru-cache "^6.0.0"

serialize-javascript@^6.0.2:
version "6.0.2"
resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz"
integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
serialize-javascript@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
dependencies:
randombytes "^2.1.0"

Expand Down
Loading

0 comments on commit 4cb30f8

Please sign in to comment.