Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev

Browse Source

# Conflicts:
#	CHANGELOG.md
#	applications/main/infrared/application.fam
#	applications/main/nfc/application.fam
#	applications/services/gui/canvas.c

...

This commit is contained in:

Willy-JL

2024-06-16 22:27:10 +02:00

parent ec707be65e 78948d38ec

commit cce922e903

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