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

🚨 Release merge conflicts
LedgerHQ · Jan 16, 2025 · 5ab951d · 5ab951d
2 parents a0119ff + 6e29214
commit 5ab951d
Show file tree

Hide file tree

Showing 268 changed files with 4,062 additions and 1,849 deletions.
diff --git a/.changeset/afraid-actors-fry.md b/.changeset/afraid-actors-fry.md
diff --git a/.changeset/angry-rats-kick.md b/.changeset/angry-rats-kick.md
diff --git a/.changeset/blue-rice-behave.md b/.changeset/blue-rice-behave.md
diff --git a/.changeset/calm-coins-buy.md b/.changeset/calm-coins-buy.md
diff --git a/.changeset/calm-waves-battle.md b/.changeset/calm-waves-battle.md
diff --git a/.changeset/chatty-shirts-tickle.md b/.changeset/chatty-shirts-tickle.md
diff --git a/.changeset/chilled-coats-drive.md b/.changeset/chilled-coats-drive.md
diff --git a/.changeset/curvy-hornets-wink.md b/.changeset/curvy-hornets-wink.md
diff --git a/.changeset/curvy-ladybugs-collect.md b/.changeset/curvy-ladybugs-collect.md
diff --git a/.changeset/curvy-parents-push.md b/.changeset/curvy-parents-push.md
diff --git a/.changeset/cyan-rabbits-return.md b/.changeset/cyan-rabbits-return.md
diff --git a/.changeset/famous-mirrors-carry.md b/.changeset/famous-mirrors-carry.md
diff --git a/.changeset/fifty-toes-sit.md b/.changeset/fifty-toes-sit.md
diff --git a/.changeset/forty-turtles-mix.md b/.changeset/forty-turtles-mix.md
diff --git a/.changeset/fresh-needles-push.md b/.changeset/fresh-needles-push.md
diff --git a/.changeset/fresh-rabbits-do.md b/.changeset/fresh-rabbits-do.md
diff --git a/.changeset/friendly-carrots-yawn.md b/.changeset/friendly-carrots-yawn.md
diff --git a/.changeset/funny-trains-speak.md b/.changeset/funny-trains-speak.md
diff --git a/.changeset/fuzzy-forks-draw.md b/.changeset/fuzzy-forks-draw.md
diff --git a/.changeset/giant-jobs-whisper.md b/.changeset/giant-jobs-whisper.md
diff --git a/.changeset/great-baboons-enjoy.md b/.changeset/great-baboons-enjoy.md
diff --git a/.changeset/grumpy-pets-allow.md b/.changeset/grumpy-pets-allow.md
diff --git a/.changeset/heavy-worms-retire.md b/.changeset/heavy-worms-retire.md
diff --git a/.changeset/honest-badgers-develop.md b/.changeset/honest-badgers-develop.md
diff --git a/.changeset/hungry-ravens-beg.md b/.changeset/hungry-ravens-beg.md
diff --git a/.changeset/large-glasses-relate.md b/.changeset/large-glasses-relate.md
diff --git a/.changeset/large-otters-refuse.md b/.changeset/large-otters-refuse.md
diff --git a/.changeset/loud-masks-relate.md b/.changeset/loud-masks-relate.md
diff --git a/.changeset/loud-spiders-fail.md b/.changeset/loud-spiders-fail.md
diff --git a/.changeset/metal-foxes-do.md b/.changeset/metal-foxes-do.md
diff --git a/.changeset/moody-mugs-grin.md b/.changeset/moody-mugs-grin.md
diff --git a/.changeset/moody-oranges-reply.md b/.changeset/moody-oranges-reply.md
diff --git a/.changeset/nine-pots-happen.md b/.changeset/nine-pots-happen.md
diff --git a/.changeset/nine-toes-worry.md b/.changeset/nine-toes-worry.md
diff --git a/.changeset/ninety-scissors-grow.md b/.changeset/ninety-scissors-grow.md
diff --git a/.changeset/perfect-schools-pretend.md b/.changeset/perfect-schools-pretend.md
diff --git a/.changeset/pink-bats-attack.md b/.changeset/pink-bats-attack.md
diff --git a/.changeset/plenty-beds-chew.md b/.changeset/plenty-beds-chew.md
diff --git a/.changeset/pretty-hairs-laugh.md b/.changeset/pretty-hairs-laugh.md
diff --git a/.changeset/purple-beers-report.md b/.changeset/purple-beers-report.md
diff --git a/.changeset/quick-frogs-develop.md b/.changeset/quick-frogs-develop.md
diff --git a/.changeset/real-eagles-scream.md b/.changeset/real-eagles-scream.md
diff --git a/.changeset/real-suits-repair.md b/.changeset/real-suits-repair.md
diff --git a/.changeset/red-roses-try.md b/.changeset/red-roses-try.md
diff --git a/.changeset/rotten-lamps-care.md b/.changeset/rotten-lamps-care.md
diff --git a/.changeset/seven-rocks-dream.md b/.changeset/seven-rocks-dream.md
diff --git a/.changeset/shy-penguins-itch.md b/.changeset/shy-penguins-itch.md
diff --git a/.changeset/silent-boats-wash.md b/.changeset/silent-boats-wash.md
diff --git a/.changeset/small-jokes-work.md b/.changeset/small-jokes-work.md
diff --git a/.changeset/smart-olives-learn.md b/.changeset/smart-olives-learn.md
diff --git a/.changeset/sour-kings-sneeze.md b/.changeset/sour-kings-sneeze.md
diff --git a/.changeset/spicy-rabbits-divide.md b/.changeset/spicy-rabbits-divide.md
diff --git a/.changeset/stale-guests-drum.md b/.changeset/stale-guests-drum.md
diff --git a/.changeset/stale-penguins-tap.md b/.changeset/stale-penguins-tap.md
diff --git a/.changeset/stupid-hotels-laugh.md b/.changeset/stupid-hotels-laugh.md
diff --git a/.changeset/stupid-starfishes-hammer.md b/.changeset/stupid-starfishes-hammer.md
diff --git a/.changeset/swift-cherries-hammer.md b/.changeset/swift-cherries-hammer.md