Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 74b121df..405e3e89 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -2,6 +2,10 @@
 
 namespace Pinetime {
   namespace Applications {
-    enum class Apps {None, Launcher, Clock, SysInfo, Meter, Brightness, Music, FirmwareValidation, Paint, Paddle, Notifications, Twos, HeartRate, Navigation, StopWatch};
+    enum class Apps { 
+      None, Launcher, Clock, SysInfo, FirmwareUpdate, FirmwareValidation, NotificationsPreview, Notifications, FlashLight, BatteryInfo,
+      Music, Paint, Paddle, Twos, HeartRate, Navigation, StopWatch,
+      QuickSettings, Settings, SettingWatchFace, SettingTimeFormat, SettingDisplay, SettingWakeUp
+    };
   }
 }