Merge branch 'develop' into update_touch_driver

2021-09-18 19:22:59 +03:00
parent 8f0771183c 5855906e49
commit e468acc99e
24 changed files with 644 additions and 15 deletions
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -12,6 +12,7 @@ namespace Pinetime {
      NotificationsPreview,
      Notifications,
      Timer,
+      Alarm,
      FlashLight,
      BatteryInfo,
      Music,