Jean-François Milants 9f67e6f652 Merge branch 'develop' into recovery-firmware
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h
2021-03-07 08:44:14 +01:00
..
2021-02-12 17:36:56 +00:00
2020-11-16 01:35:45 +01:00
2020-11-16 01:35:45 +01:00