diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-08-10 12:30:42 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-08-10 12:30:42 +0200 |
| commit | 81a143173fe207565ae233b54cd364e3694800c1 (patch) | |
| tree | 95e09fb8d0f737277bb232e38299822533ddb10f /src/displayapp/screens/DropDownDemo.cpp | |
| parent | c086520c9796322043d9617e6cff5c554529d640 (diff) | |
| parent | 84a6c88e98d8b1420edbddd7b67a38737bf5cbb2 (diff) | |
Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://github.com/hassless/InfiniTime into hassless-improve-battery-percentage-to-battery-icon-mapping
# Conflicts:
# src/displayapp/screens/BatteryIcon.cpp
Diffstat (limited to 'src/displayapp/screens/DropDownDemo.cpp')
0 files changed, 0 insertions, 0 deletions