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, 2 insertions, 1 deletions

diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index a3a78cc9..62256b9e 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -21,7 +21,8 @@ namespace Pinetime {
         RestoreBrightness,
         ShowPairingKey,
         AlarmTriggered,
-        Clock
+        Clock,
+        AirplaneModeToggle
       };
     }
   }