Merge branch 'master' into mm/fix-jade-multisig-address-verification

moneymanolis · Aug 18, 2023 · dccc684 · dccc684
2 parents cb25fcf + 72fed92
commit dccc684
Show file tree

Hide file tree

Showing 10 changed files with 1,717 additions and 2,062 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/pyinstaller/electron/build/entitlements.mac.plist b/pyinstaller/electron/build/entitlements.mac.plist
@@ -6,6 +6,11 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
+    <!-- 
+      this has been introduced with #2344
+      However it needs MAC provisioning profiles to be set up
+      And those trigger a App Review by Apple which we
+      currently want to avoid. Maybe later.
     <key>CFBundleURLTypes</key>
       <array>
         <dict>
@@ -17,5 +22,6 @@
           </array>
         </dict>
       </array>
+    -->
   </dict>
 </plist>
diff --git a/pyinstaller/electron/package-lock.json b/pyinstaller/electron/package-lock.json