Skip to content

Commit 404abb0

Browse files
committed
Merge branch 'release/2.6.0' into WALLET-1330-dep-3-crypto-vault-modernization
Integrate release/2.6.0 (DEP-2 squash-merged as #1377) into the DEP-3 branch. Net content unchanged: DEP-3 already carried the same DEP-2 changes via individual commits, so the 3-way merge keeps the DEP-3 crypto deps and resolves the package-lock conflict to the equivalent tree. Records release/2.6.0 as an ancestor so the PR can be retargeted to release/2.6.0 and merge cleanly.
2 parents 653ee50 + 78ff3ca commit 404abb0

0 file changed

File tree

    0 commit comments

    Comments
     (0)