Merge pull request #8676 from LedgerHQ/support/release-merge-conflicts

🚨 Release merge conflicts
LedgerHQ · Jan 3, 2025 · 32492e0 · 32492e0
2 parents 1d47a95 + 4b73a03
commit 32492e0
Show file tree

Hide file tree

Showing 233 changed files with 3,691 additions and 2,008 deletions.
diff --git a/.changeset/beige-moose-worry.md b/.changeset/beige-moose-worry.md
diff --git a/.changeset/beige-rings-move.md b/.changeset/beige-rings-move.md
diff --git a/.changeset/big-apricots-live.md b/.changeset/big-apricots-live.md
diff --git a/.changeset/brown-hats-think.md b/.changeset/brown-hats-think.md
diff --git a/.changeset/clean-olives-obey.md b/.changeset/clean-olives-obey.md
diff --git a/.changeset/clever-impalas-explain.md b/.changeset/clever-impalas-explain.md
diff --git a/.changeset/curly-jeans-hope.md b/.changeset/curly-jeans-hope.md
diff --git a/.changeset/cyan-singers-mix.md b/.changeset/cyan-singers-mix.md
diff --git a/.changeset/dry-rockets-hide.md b/.changeset/dry-rockets-hide.md
diff --git a/.changeset/eight-ducks-rescue.md b/.changeset/eight-ducks-rescue.md
diff --git a/.changeset/few-toes-drive.md b/.changeset/few-toes-drive.md
diff --git a/.changeset/fifty-shrimps-hide.md b/.changeset/fifty-shrimps-hide.md
diff --git a/.changeset/fuzzy-cats-enjoy.md b/.changeset/fuzzy-cats-enjoy.md
diff --git a/.changeset/giant-geese-film.md b/.changeset/giant-geese-film.md
diff --git a/.changeset/giant-zoos-reply.md b/.changeset/giant-zoos-reply.md
diff --git a/.changeset/good-mails-cover.md b/.changeset/good-mails-cover.md
diff --git a/.changeset/good-terms-hunt.md b/.changeset/good-terms-hunt.md
diff --git a/.changeset/happy-insects-sing.md b/.changeset/happy-insects-sing.md
diff --git a/.changeset/happy-tomatoes-explain.md b/.changeset/happy-tomatoes-explain.md
diff --git a/.changeset/heavy-starfishes-fix.md b/.changeset/heavy-starfishes-fix.md
diff --git a/.changeset/hip-crabs-develop.md b/.changeset/hip-crabs-develop.md
diff --git a/.changeset/honest-feet-trade.md b/.changeset/honest-feet-trade.md
diff --git a/.changeset/honest-trainers-shake.md b/.changeset/honest-trainers-shake.md
diff --git a/.changeset/hungry-moles-yawn.md b/.changeset/hungry-moles-yawn.md
diff --git a/.changeset/large-books-prove.md b/.changeset/large-books-prove.md
diff --git a/.changeset/late-phones-add.md b/.changeset/late-phones-add.md
diff --git a/.changeset/light-poets-smile.md b/.changeset/light-poets-smile.md
diff --git a/.changeset/lovely-glasses-study.md b/.changeset/lovely-glasses-study.md
diff --git a/.changeset/lovely-vans-hug.md b/.changeset/lovely-vans-hug.md
diff --git a/.changeset/many-moons-study.md b/.changeset/many-moons-study.md
diff --git a/.changeset/mean-tables-behave.md b/.changeset/mean-tables-behave.md
diff --git a/.changeset/metal-points-destroy.md b/.changeset/metal-points-destroy.md
diff --git a/.changeset/mighty-days-tan.md b/.changeset/mighty-days-tan.md
diff --git a/.changeset/new-bees-attack.md b/.changeset/new-bees-attack.md
diff --git a/.changeset/odd-cooks-glow.md b/.changeset/odd-cooks-glow.md
diff --git a/.changeset/rare-schools-happen.md b/.changeset/rare-schools-happen.md
diff --git a/.changeset/rotten-horses-shop.md b/.changeset/rotten-horses-shop.md
diff --git a/.changeset/rude-bats-fold.md b/.changeset/rude-bats-fold.md
diff --git a/.changeset/shaggy-days-flash.md b/.changeset/shaggy-days-flash.md
diff --git a/.changeset/shy-insects-flash.md b/.changeset/shy-insects-flash.md
diff --git a/.changeset/silly-cougars-rescue.md b/.changeset/silly-cougars-rescue.md
diff --git a/.changeset/silly-seals-argue.md b/.changeset/silly-seals-argue.md
diff --git a/.changeset/spicy-schools-look.md b/.changeset/spicy-schools-look.md
diff --git a/.changeset/strong-bobcats-marry.md b/.changeset/strong-bobcats-marry.md
diff --git a/.changeset/swift-islands-begin.md b/.changeset/swift-islands-begin.md
diff --git a/.changeset/three-snails-reply.md b/.changeset/three-snails-reply.md
diff --git a/.changeset/wet-rocks-cough.md b/.changeset/wet-rocks-cough.md
diff --git a/.changeset/witty-swans-share.md b/.changeset/witty-swans-share.md
diff --git a/.changeset/young-eels-hunt.md b/.changeset/young-eels-hunt.md
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @ledgerhq/live-cli
 
+## 24.8.3
+
+### Patch Changes
+
+- Updated dependencies [[`93f8f78`](https://github.com/LedgerHQ/ledger-live/commit/93f8f7885d1300208310599e743a4d1fae4ec2a4), [`40f1cd4`](https://github.com/LedgerHQ/ledger-live/commit/40f1cd4c22d17480dcf86c73e90a07866667b0ba), [`c45ee45`](https://github.com/LedgerHQ/ledger-live/commit/c45ee457a9f5500ae42f2a8fb7f0cfb7926f319b), [`1a388b9`](https://github.com/LedgerHQ/ledger-live/commit/1a388b946ce309c0a0e6e0c50b28af4e3c3a2cdb), [`995b771`](https://github.com/LedgerHQ/ledger-live/commit/995b771671b23931c6a85534841e8d88ca2acaf4), [`475b74c`](https://github.com/LedgerHQ/ledger-live/commit/475b74c1ba01b7e7a374cca14e274769a3c17476), [`faef7ed`](https://github.com/LedgerHQ/ledger-live/commit/faef7ed3b9954d2bbaf5c5a518e247fd441a73e7), [`16a4794`](https://github.com/LedgerHQ/ledger-live/commit/16a479420976c4c12fb8984dcba9cf572c576292), [`322fd58`](https://github.com/LedgerHQ/ledger-live/commit/322fd58ffcde6d592eb27af1fd93f8c45d33205c), [`2673c1d`](https://github.com/LedgerHQ/ledger-live/commit/2673c1d98788fafe7e95bd798be06a6b5e39e1c0), [`61aedb7`](https://github.com/LedgerHQ/ledger-live/commit/61aedb7bbd45e73d6bc2b53e55f562262d5c5fa7), [`224cc07`](https://github.com/LedgerHQ/ledger-live/commit/224cc07b86e8c5a6167ff77cfb99e42a1057813e), [`58beb75`](https://github.com/LedgerHQ/ledger-live/commit/58beb7504454b64cb5a955926ef27f811397aa6d)]:
+  - @ledgerhq/live-common@34.16.0
+  - @ledgerhq/hw-app-btc@10.5.0
+  - @ledgerhq/coin-framework@0.20.1
+  - @ledgerhq/coin-bitcoin@0.8.10
+  - @ledgerhq/device-core@0.4.9
+  - @ledgerhq/live-countervalues@0.2.15
+  - @ledgerhq/live-wallet@0.7.7
+
+## 24.8.3-next.3
+
+### Patch Changes
+
+- Updated dependencies [[`16a4794`](https://github.com/LedgerHQ/ledger-live/commit/16a479420976c4c12fb8984dcba9cf572c576292)]:
+  - @ledgerhq/live-common@34.16.0-next.3
+
+## 24.8.3-next.2
+
+### Patch Changes
+
+- Updated dependencies [[`61aedb7`](https://github.com/LedgerHQ/ledger-live/commit/61aedb7bbd45e73d6bc2b53e55f562262d5c5fa7)]:
+  - @ledgerhq/live-common@34.16.0-next.2
+  - @ledgerhq/coin-framework@0.20.1-next.1
+  - @ledgerhq/coin-bitcoin@0.8.10-next.1
+  - @ledgerhq/device-core@0.4.9-next.1
+  - @ledgerhq/live-countervalues@0.2.15-next.1
+  - @ledgerhq/live-wallet@0.7.7-next.1
+
+## 24.8.3-next.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ledgerhq/live-common@34.16.0-next.1
+
+## 24.8.3-next.0
+
+### Patch Changes
+
+- Updated dependencies [[`93f8f78`](https://github.com/LedgerHQ/ledger-live/commit/93f8f7885d1300208310599e743a4d1fae4ec2a4), [`40f1cd4`](https://github.com/LedgerHQ/ledger-live/commit/40f1cd4c22d17480dcf86c73e90a07866667b0ba), [`c45ee45`](https://github.com/LedgerHQ/ledger-live/commit/c45ee457a9f5500ae42f2a8fb7f0cfb7926f319b), [`1a388b9`](https://github.com/LedgerHQ/ledger-live/commit/1a388b946ce309c0a0e6e0c50b28af4e3c3a2cdb), [`995b771`](https://github.com/LedgerHQ/ledger-live/commit/995b771671b23931c6a85534841e8d88ca2acaf4), [`475b74c`](https://github.com/LedgerHQ/ledger-live/commit/475b74c1ba01b7e7a374cca14e274769a3c17476), [`faef7ed`](https://github.com/LedgerHQ/ledger-live/commit/faef7ed3b9954d2bbaf5c5a518e247fd441a73e7), [`322fd58`](https://github.com/LedgerHQ/ledger-live/commit/322fd58ffcde6d592eb27af1fd93f8c45d33205c), [`2673c1d`](https://github.com/LedgerHQ/ledger-live/commit/2673c1d98788fafe7e95bd798be06a6b5e39e1c0), [`224cc07`](https://github.com/LedgerHQ/ledger-live/commit/224cc07b86e8c5a6167ff77cfb99e42a1057813e), [`58beb75`](https://github.com/LedgerHQ/ledger-live/commit/58beb7504454b64cb5a955926ef27f811397aa6d)]:
+  - @ledgerhq/live-common@34.16.0-next.0
+  - @ledgerhq/hw-app-btc@10.5.0-next.0
+  - @ledgerhq/coin-framework@0.20.1-next.0
+  - @ledgerhq/coin-bitcoin@0.8.10-next.0
+  - @ledgerhq/device-core@0.4.9-next.0
+  - @ledgerhq/live-countervalues@0.2.15-next.0
+  - @ledgerhq/live-wallet@0.7.7-next.0
+
 ## 24.8.2
 
 ### Patch Changes

diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.8.2",
+  "version": "24.8.3",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",