Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/Messages.h
#	src/displayapp/screens/settings/Settings.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index b876020..dc9e625 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -38,6 +38,7 @@ namespace Pinetime {
       SettingSetTime,
       SettingChimes,
       SettingShakeThreshold,
+      SettingAirplaneMode,
       Error
     };
   }