Merge remote-tracking branch 'upstream/develop' into pts-settings

2021-10-18 23:14:39 +02:00
parent c4ab17f587 ab7c6e162f
commit ff1fce18d6
56 changed files with 1073 additions and 260 deletions
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -31,7 +31,10 @@ namespace Pinetime {
      SettingTimeFormat,
      SettingDisplay,
      SettingWakeUp,
-      SettingSteps
+      SettingSteps,
+      SettingSetDate,
+      SettingSetTime,
+      Error,
    };
  }
 }