Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-f… · Next-Flip/Momentum-Firmware@3ab887a · GitHub

Commit

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-f…

Browse files

…irmware into mntm-dev

# Conflicts:
#	applications/services/gui/elements.c
#	applications/services/gui/elements.h
#	targets/f7/api_symbols.csv

Loading branch information

Willy-JL committed Mar 23, 2024

2 parents 401ab0d + 0a48658 commit 3ab887a