Merge upstream

2021-09-16 16:01:25 -04:00
parent f857a757a7
commit 1d43adcdfa
33 changed files with 300 additions and 232 deletions
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -7,7 +7,6 @@ namespace Pinetime {
        GoToRunning,
        UpdateDateTime,
        UpdateBleConnection,
-        UpdateBatteryLevel,
        TouchEvent,
        ButtonPushed,
        NewNotification,