-
Notifications
You must be signed in to change notification settings - Fork 149
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Edge branch #388
Open
doc-hex
wants to merge
47
commits into
master
Choose a base branch
from
new_edge
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Edge branch #388
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # releases/Next-ChangeLog.md # releases/signatures.txt # shared/actions.py # shared/auth.py # shared/bsms.py # shared/decoders.py # shared/descriptor.py # shared/multisig.py # shared/nfc.py # shared/psbt.py # shared/utils.py # stm32/COLDCARD_Q1/file_time.c # stm32/MK4-Makefile # stm32/Q1-Makefile # testing/conftest.py # testing/descriptor.py # testing/test_bsms.py # testing/test_multisig.py # testing/test_sign.py
samjay121566
approved these changes
Sep 26, 2024
… all miniscripts deleted - fixed
(cherry picked from commit 9e1ce7a)
(cherry picked from commit d1d104c)
(cherry picked from commit 1b54536)
(cherry picked from commit 8f86ed1)
(cherry picked from commit 5568082)
…rge its settings (cherry picked from commit 95b1308)
(cherry picked from commit 85b4783)
(cherry picked from commit c9882d7)
(cherry picked from commit c425fc6)
(cherry picked from commit d270cf6)
(cherry picked from commit 8957ad3)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will be a long-lived PR / branch containing "edge" firmware differences.