Merge branch 'develop' into mb889-bridge-controller

MetaMask · Jun 27, 2024 · 4ecb621 · 4ecb621
2 parents 574eaa6 + 1d33d6f
commit 4ecb621
Show file tree

Hide file tree

Showing 143 changed files with 2,849 additions and 1,287 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v20
+v20.14
diff --git a/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch b/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch
diff --git a/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch b/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch
diff --git a/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch b/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json