Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev --nobuild

Browse Source

# Conflicts:
#	applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
#	applications/settings/desktop_settings/scenes/desktop_settings_scene_quick_apps_direction_menu.c

...

This commit is contained in:

Willy-JL

2024-05-28 23:43:46 +01:00

parent 958020a4b5 f309844ee0

commit fe502c0f9f

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