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

🚨 Release merge conflicts
LedgerHQ · Sep 30, 2024 · bc06058 · bc06058
2 parents f4957fd + f740a5e
commit bc06058
Show file tree

Hide file tree

Showing 232 changed files with 3,027 additions and 1,233 deletions.
diff --git a/.changeset/blue-apricots-jam.md b/.changeset/blue-apricots-jam.md
diff --git a/.changeset/calm-rocks-march.md b/.changeset/calm-rocks-march.md
diff --git a/.changeset/cuddly-eggs-cross.md b/.changeset/cuddly-eggs-cross.md
diff --git a/.changeset/curly-terms-rescue.md b/.changeset/curly-terms-rescue.md
diff --git a/.changeset/curvy-worms-serve.md b/.changeset/curvy-worms-serve.md
diff --git a/.changeset/cyan-lamps-unite.md b/.changeset/cyan-lamps-unite.md
diff --git a/.changeset/dry-parents-breathe.md b/.changeset/dry-parents-breathe.md
diff --git a/.changeset/dry-weeks-bow.md b/.changeset/dry-weeks-bow.md
diff --git a/.changeset/eighty-pears-run.md b/.changeset/eighty-pears-run.md
diff --git a/.changeset/fair-goats-sniff.md b/.changeset/fair-goats-sniff.md
diff --git a/.changeset/few-gifts-double.md b/.changeset/few-gifts-double.md
diff --git a/.changeset/forty-panthers-clean.md b/.changeset/forty-panthers-clean.md
diff --git a/.changeset/funny-suits-whisper.md b/.changeset/funny-suits-whisper.md
diff --git a/.changeset/gentle-fireants-nail.md b/.changeset/gentle-fireants-nail.md
diff --git a/.changeset/giant-pants-deliver.md b/.changeset/giant-pants-deliver.md
diff --git a/.changeset/great-phones-lick.md b/.changeset/great-phones-lick.md
diff --git a/.changeset/hip-walls-breathe.md b/.changeset/hip-walls-breathe.md
diff --git a/.changeset/late-seals-buy.md b/.changeset/late-seals-buy.md
diff --git a/.changeset/lemon-starfishes-do.md b/.changeset/lemon-starfishes-do.md
diff --git a/.changeset/loud-donkeys-glow.md b/.changeset/loud-donkeys-glow.md
diff --git a/.changeset/mean-pears-wash.md b/.changeset/mean-pears-wash.md
diff --git a/.changeset/neat-cameras-own.md b/.changeset/neat-cameras-own.md
diff --git a/.changeset/neat-items-lay.md b/.changeset/neat-items-lay.md
diff --git a/.changeset/orange-tomatoes-yell.md b/.changeset/orange-tomatoes-yell.md
diff --git a/.changeset/poor-dots-cry.md b/.changeset/poor-dots-cry.md
diff --git a/.changeset/pretty-buttons-worry.md b/.changeset/pretty-buttons-worry.md
diff --git a/.changeset/rude-ants-share.md b/.changeset/rude-ants-share.md
diff --git a/.changeset/shiny-pants-refuse.md b/.changeset/shiny-pants-refuse.md
diff --git a/.changeset/shy-ducks-sparkle.md b/.changeset/shy-ducks-sparkle.md
diff --git a/.changeset/silent-melons-lie.md b/.changeset/silent-melons-lie.md
diff --git a/.changeset/silly-rice-push.md b/.changeset/silly-rice-push.md
diff --git a/.changeset/sixty-insects-rescue.md b/.changeset/sixty-insects-rescue.md
diff --git a/.changeset/smart-mails-refuse.md b/.changeset/smart-mails-refuse.md
diff --git a/.changeset/smooth-ears-learn.md b/.changeset/smooth-ears-learn.md
diff --git a/.changeset/soft-cherries-fold.md b/.changeset/soft-cherries-fold.md
diff --git a/.changeset/sour-planets-itch.md b/.changeset/sour-planets-itch.md
diff --git a/.changeset/strong-steaks-rule.md b/.changeset/strong-steaks-rule.md
diff --git a/.changeset/swift-turtles-taste.md b/.changeset/swift-turtles-taste.md
diff --git a/.changeset/tame-tigers-end.md b/.changeset/tame-tigers-end.md
diff --git a/.changeset/thick-glasses-swim.md b/.changeset/thick-glasses-swim.md
diff --git a/.changeset/thin-readers-attend.md b/.changeset/thin-readers-attend.md
diff --git a/.changeset/tiny-gifts-matter.md b/.changeset/tiny-gifts-matter.md
diff --git a/.changeset/tiny-pigs-sit.md b/.changeset/tiny-pigs-sit.md
diff --git a/.changeset/tricky-socks-cheer.md b/.changeset/tricky-socks-cheer.md
diff --git a/.changeset/twelve-owls-accept.md b/.changeset/twelve-owls-accept.md
diff --git a/.changeset/unlucky-beds-leave.md b/.changeset/unlucky-beds-leave.md
diff --git a/.changeset/unlucky-seals-remember.md b/.changeset/unlucky-seals-remember.md
diff --git a/.changeset/violet-planets-brake.md b/.changeset/violet-planets-brake.md
diff --git a/.changeset/wet-clocks-nail.md b/.changeset/wet-clocks-nail.md
diff --git a/.changeset/yellow-masks-peel.md b/.changeset/yellow-masks-peel.md
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,5 +1,73 @@
 # @ledgerhq/live-cli
 
+## 24.6.0
+
+### Minor Changes
+
+- [#7771](https://github.com/LedgerHQ/ledger-live/pull/7771) [`0a71c43`](https://github.com/LedgerHQ/ledger-live/commit/0a71c4344b7bb2c6640f3e5dda152ae815573330) Thanks [@valpinkman](https://github.com/valpinkman)! - Implement reinstallConfiguration command
+
+### Patch Changes
+
+- Updated dependencies [[`1605678`](https://github.com/LedgerHQ/ledger-live/commit/1605678a4c43ce85b19bd549b295f3c67ff1dcb9), [`e0536c5`](https://github.com/LedgerHQ/ledger-live/commit/e0536c5e27a2036919abd0fd182765b32ea0112e), [`f805d14`](https://github.com/LedgerHQ/ledger-live/commit/f805d1470f927824233f94eaba065b00d7af18cf), [`461ddc5`](https://github.com/LedgerHQ/ledger-live/commit/461ddc56fbbe862789fe9a06db8a7e7a894e4bdd), [`672875f`](https://github.com/LedgerHQ/ledger-live/commit/672875feb9876edacf06aaea6c7bb47f4bb7d993), [`0a71c43`](https://github.com/LedgerHQ/ledger-live/commit/0a71c4344b7bb2c6640f3e5dda152ae815573330), [`5762905`](https://github.com/LedgerHQ/ledger-live/commit/5762905a8cc4d2e737f532a09ba2504c7d7961df), [`0a71c43`](https://github.com/LedgerHQ/ledger-live/commit/0a71c4344b7bb2c6640f3e5dda152ae815573330), [`7865dcb`](https://github.com/LedgerHQ/ledger-live/commit/7865dcb1891b89a0d9fe28efeea3a6284f3d87c5), [`8679584`](https://github.com/LedgerHQ/ledger-live/commit/86795841982e06058294528bd8d2847fc4f62513), [`1605678`](https://github.com/LedgerHQ/ledger-live/commit/1605678a4c43ce85b19bd549b295f3c67ff1dcb9)]:
+ - @ledgerhq/cryptoassets@13.5.0
+ - @ledgerhq/live-common@34.9.0
+ - @ledgerhq/hw-transport-http@6.30.4
+ - @ledgerhq/hw-app-btc@10.4.3
+ - @ledgerhq/coin-bitcoin@0.8.1
+ - @ledgerhq/live-network@2.0.1
+ - @ledgerhq/errors@6.19.1
+ - @ledgerhq/device-core@0.4.0
+ - @ledgerhq/coin-framework@0.18.1
+ - @ledgerhq/live-countervalues@0.2.6
+ - @ledgerhq/live-wallet@0.6.1
+ - @ledgerhq/devices@8.4.4
+ - @ledgerhq/hw-transport@6.31.4
+ - @ledgerhq/hw-transport-node-hid@6.29.5
+ - @ledgerhq/hw-transport-node-speculos@6.29.4
+ - @ledgerhq/hw-transport-mocker@6.29.4
+
+## 24.6.0-next.1
+
+### Patch Changes
+
+- Updated dependencies [[`f805d14`](https://github.com/LedgerHQ/ledger-live/commit/f805d1470f927824233f94eaba065b00d7af18cf)]:
+ - @ledgerhq/hw-transport-http@6.30.4-next.1
+ - @ledgerhq/cryptoassets@13.5.0-next.1
+ - @ledgerhq/hw-app-btc@10.4.3-next.1
+ - @ledgerhq/coin-bitcoin@0.8.1-next.1
+ - @ledgerhq/live-common@34.9.0-next.1
+ - @ledgerhq/live-network@2.0.1-next.1
+ - @ledgerhq/coin-framework@0.18.1-next.1
+ - @ledgerhq/live-countervalues@0.2.6-next.1
+ - @ledgerhq/live-wallet@0.6.1-next.1
+ - @ledgerhq/device-core@0.4.0-next.1
+
+## 24.6.0-next.0
+
+### Minor Changes
+
+- [#7771](https://github.com/LedgerHQ/ledger-live/pull/7771) [`0a71c43`](https://github.com/LedgerHQ/ledger-live/commit/0a71c4344b7bb2c6640f3e5dda152ae815573330) Thanks [@valpinkman](https://github.com/valpinkman)! - Implement reinstallConfiguration command
+
+### Patch Changes
+
+- Updated dependencies [[`1605678`](https://github.com/LedgerHQ/ledger-live/commit/1605678a4c43ce85b19bd549b295f3c67ff1dcb9), [`e0536c5`](https://github.com/LedgerHQ/ledger-live/commit/e0536c5e27a2036919abd0fd182765b32ea0112e), [`461ddc5`](https://github.com/LedgerHQ/ledger-live/commit/461ddc56fbbe862789fe9a06db8a7e7a894e4bdd), [`672875f`](https://github.com/LedgerHQ/ledger-live/commit/672875feb9876edacf06aaea6c7bb47f4bb7d993), [`0a71c43`](https://github.com/LedgerHQ/ledger-live/commit/0a71c4344b7bb2c6640f3e5dda152ae815573330), [`5762905`](https://github.com/LedgerHQ/ledger-live/commit/5762905a8cc4d2e737f532a09ba2504c7d7961df), [`0a71c43`](https://github.com/LedgerHQ/ledger-live/commit/0a71c4344b7bb2c6640f3e5dda152ae815573330), [`7865dcb`](https://github.com/LedgerHQ/ledger-live/commit/7865dcb1891b89a0d9fe28efeea3a6284f3d87c5), [`8679584`](https://github.com/LedgerHQ/ledger-live/commit/86795841982e06058294528bd8d2847fc4f62513), [`1605678`](https://github.com/LedgerHQ/ledger-live/commit/1605678a4c43ce85b19bd549b295f3c67ff1dcb9)]:
+ - @ledgerhq/cryptoassets@13.5.0-next.0
+ - @ledgerhq/live-common@34.9.0-next.0
+ - @ledgerhq/errors@6.19.1-next.0
+ - @ledgerhq/device-core@0.4.0-next.0
+ - @ledgerhq/coin-framework@0.18.1-next.0
+ - @ledgerhq/coin-bitcoin@0.8.1-next.0
+ - @ledgerhq/live-countervalues@0.2.6-next.0
+ - @ledgerhq/live-wallet@0.6.1-next.0
+ - @ledgerhq/devices@8.4.4-next.0
+ - @ledgerhq/hw-transport@6.31.4-next.0
+ - @ledgerhq/hw-transport-http@6.30.4-next.0
+ - @ledgerhq/hw-transport-node-hid@6.29.5-next.0
+ - @ledgerhq/hw-transport-node-speculos@6.29.4-next.0
+ - @ledgerhq/live-network@2.0.1-next.0
+ - @ledgerhq/hw-app-btc@10.4.3-next.0
+ - @ledgerhq/hw-transport-mocker@6.29.4-next.0
+
 ## 24.5.2
 
 ### Patch Changes