mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-04-24 03:29:57 -07:00
Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into xfw-new-app-system
# Conflicts: # applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/DevproWroom/esp32_marauder_dev_board_pro.bin # applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/WifidevS2/esp32_marauder_flipper_sd_serial.bin # applications/external/esubghz_chat/application.fam # applications/external/esubghz_chat/esubghz_chat.c # applications/external/esubghz_chat/esubghz_chat_i.h # applications/external/esubghz_chat/scenes/esubghz_chat_key_display.c # applications/external/esubghz_chat/scenes/esubghz_chat_key_menu.c # applications/external/esubghz_chat/scenes/esubghz_chat_key_read_popup.c # applications/external/esubghz_chat/scenes/esubghz_chat_key_share_popup.c # applications/external/esubghz_chat/scenes/esubghz_chat_scene_config.h
This commit is contained in:
Willy-JL