Merge remote-tracking branch 'xero/dev' into mntm-dev --nobuild

Browse Source

# Conflicts:
#	.gitmodules
#	applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
#	applications/system/application.fam

...

This commit is contained in:

Willy-JL

2024-11-10 04:46:13 +00:00

parent c9ea421a3c aaedf2ffe5

commit bacafc417f

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

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

Diff Content Not Available