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
..
2020-08-10 17:03:30 +02:00
2020-10-06 21:10:51 +02:00
2020-10-19 21:26:13 +02:00
2021-01-19 11:07:47 -08:00
2020-07-22 15:33:57 -07:00