merge

MetaMask · Nov 24, 2022 · f128458 · f128458
2 parents ab819c7 + 266d7d9
commit f128458
Show file tree

Hide file tree

Showing 99 changed files with 4,442 additions and 973 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -803,7 +803,7 @@ jobs:
       - run:
           name: Set branch parent commit env var
           command: |
-            echo "export PARENT_COMMIT=$(git rev-parse "$(git rev-list --topo-order --reverse HEAD ^origin/develop | head -1)"^)" >> $BASH_ENV
+            echo "export PARENT_COMMIT=$(git merge-base origin/HEAD HEAD)" >> $BASH_ENV
             source $BASH_ENV
       - run:
           name: build:announce

diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -4,6 +4,7 @@ ignores:
   # webapp deps
   #
 
+  - '@lavamoat/snow'
   - '@babel/runtime'
   - '@fortawesome/fontawesome-free'
   - 'punycode'

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json