Skip to content

Commit

Permalink
Merge pull request #8356 from LedgerHQ/support/release-merge-conflicts
Browse files Browse the repository at this point in the history
🚨 Release merge conflicts
  • Loading branch information
Wozacosta authored Nov 15, 2024
2 parents 34cf0f9 + 225a27b commit 896a5b5
Show file tree
Hide file tree
Showing 280 changed files with 5,614 additions and 1,291 deletions.
5 changes: 0 additions & 5 deletions .changeset/big-lions-refuse.md

This file was deleted.

15 changes: 0 additions & 15 deletions .changeset/breezy-deers-scream.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/chilled-points-argue.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/clean-nails-laugh.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/cold-rivers-raise.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/cyan-berries-refuse.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/dull-geckos-remain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/dull-plums-cheer.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/early-garlics-rhyme.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/eighty-geckos-smash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/eleven-tomatoes-approve.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/few-bikes-act.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fifty-years-impress.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/five-pianos-approve.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/forty-ants-end.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/forty-students-eat.md

This file was deleted.

14 changes: 0 additions & 14 deletions .changeset/friendly-socks-hunt.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fuzzy-boxes-confess.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/giant-peas-unite.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/gorgeous-parents-join.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/great-forks-sip.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/green-rice-cheer.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/happy-baboons-suffer.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/healthy-houses-smell.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/large-crabs-reply.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lazy-mayflies-talk.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lemon-news-chew.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/light-oranges-serve.md

This file was deleted.

12 changes: 0 additions & 12 deletions .changeset/mean-eyes-lay.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/mean-phones-sip.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/mighty-wombats-fix.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/neat-paws-greet.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nervous-baboons-allow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nervous-kangaroos-mix.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/nervous-pumpkins-remain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/new-plums-shout.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/ninety-days-wait.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/ninety-moles-listen.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/olive-mangos-repeat.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/pink-candles-happen.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/plenty-dolphins-sneeze.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/popular-jobs-occur.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/purple-peaches-cross.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/real-donuts-occur.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rude-dancers-fry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/selfish-rocks-greet.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/short-hotels-invite.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/short-spoons-notice.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silly-timers-burn.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/slow-buses-end.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/slow-dingos-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/slow-lions-taste.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/slow-poems-appear.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-experts-hammer.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/smart-geckos-add.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/strong-spiders-do.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/tame-brooms-breathe.md

This file was deleted.

Loading

0 comments on commit 896a5b5

Please sign in to comment.