diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-07-13 20:31:26 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-07-13 20:31:26 +0200 |
| commit | 3e705548442f1f208c2092ffc865ae824ee0955a (patch) | |
| tree | 7385ab23e93eb7746cf459c64679ddcdaff4fc41 /bootloader | |
| parent | e21f6a7f414d1f832e8fddfeaab3b9de05aa3459 (diff) | |
| parent | 4f378e8726fdcff72598aa6ed12eeaa6b3e61355 (diff) | |
Merge branch 'develop' into notify-battery-level
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
Diffstat (limited to 'bootloader')
0 files changed, 0 insertions, 0 deletions