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

2021-12-09 22:41:29 +01:00
parent ae4b9e0f2e 42a5cdb5b7
commit 6cf4a933b6
46 changed files with 1963 additions and 243 deletions
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -25,6 +25,8 @@ namespace Pinetime {
      Metronome,
      Motion,
      Steps,
+      Weather,
+      PassKey,
      QuickSettings,
      Settings,
      SettingWatchFace,