Merge branch 'new_edge' into edge_Sep2024_test

Browse Source

# 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

...

This commit is contained in:

scgbckbone 2024-09-17 15:46:00 +02:00

parent e3f75619d5 bb87cdd59a

commit e344bac322

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available