Jean-François Milants 40cdb54772 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
2022-02-20 15:25:24 +01:00
..
2021-12-23 20:30:14 -06:00
2021-12-23 20:30:14 -06:00
2021-12-10 01:18:57 +00:00
2021-12-10 01:18:57 +00:00
2021-12-23 20:30:14 -06:00