Merge with develop and fix conflicts from timaios:set-datetime-manually.

2021-10-10 16:01:43 +02:00
parent 977faebcb8 3e9c30a18f
commit cf9e149b33
10 changed files with 508 additions and 8 deletions
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -32,7 +32,9 @@ namespace Pinetime {
      SettingDisplay,
      SettingWakeUp,
      SettingSteps,
-      SettingPineTimeStyle
+      SettingPineTimeStyle,
+      SettingSetDate,
+      SettingSetTime
    };
  }
 }