Merge branch 'develop' into patch-weather

2021-12-09 22:20:29 +02:00
parent 5f50f0e538 b946b8d156
commit e8c1302cd6
16 changed files with 306 additions and 62 deletions
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -26,6 +26,7 @@ namespace Pinetime {
      Motion,
      Steps,
      Weather,
+      PassKey,
      QuickSettings,
      Settings,
      SettingWatchFace,