Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into new-app-system

Browse Source

# Conflicts:
#	applications/external/evil_portal/evil_portal_app.c
#	applications/external/gpio_reader_b/application.fam
#	applications/external/magspoof/application.fam
#	applications/external/magspoof/helpers/mag_helpers.c
#	applications/external/nrf24channelscanner/nrf24channelscanner.c
#	applications/external/protoview/app.h
#	applications/external/solitaire/defines.h
#	applications/external/swd_probe/swd_probe_app.c
#	applications/external/totp/ui/scenes/standby/standby.c
#	applications/external/uart_terminal/application.fam

...

This commit is contained in:

Willy-JL

2023-11-15 00:03:46 +00:00

parent b7798d2e5e 8096391c6c

commit d3c4785655

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