Merge branch 'develop' into chore/mmassets-344_add-telemetry-currency…

…-conversion
MetaMask · Sep 10, 2024 · 0add1f3 · 0add1f3
2 parents cdaef25 + bbbe511
commit 0add1f3
Show file tree

Hide file tree

Showing 63 changed files with 499 additions and 787 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -117,6 +117,10 @@ workflows:
       - check-pr-tag
       - prep-deps
       - get-changed-files-with-git-diff:
+          filters:
+              branches:
+                ignore:
+                  - master
           requires:
             - prep-deps
       - test-deps-audit:

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/en_GB/messages.json b/app/_locales/en_GB/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json