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
This commit is contained in:
Jean-François Milants
2022-02-20 15:25:24 +01:00
22 changed files with 295 additions and 87 deletions

View File

@@ -21,7 +21,8 @@ namespace Pinetime {
RestoreBrightness,
ShowPairingKey,
AlarmTriggered,
Clock
Clock,
AirplaneModeToggle
};
}
}