Merge branch 'develop' into recovery-firmware

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h
This commit is contained in:
Jean-François Milants 2021-03-07 08:44:14 +01:00
commit 9f67e6f652
559 changed files with 33795 additions and 100474 deletions

View file

@ -10,6 +10,7 @@ To build this project, you'll need:
```
git clone https://github.com/JF002/Pinetime.git
cd Pinetime
git submodule update --init
mkdir build
cd build
```