Files
InfiniTime/src/displayapp/screens/settings
Jean-François Milants fbe964ff44 Merge branch 'watchface-casio-digital-G7710' of github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710
# Conflicts:
#	src/components/settings/Settings.h
#	src/displayapp/screens/CheckboxList.cpp
#	src/displayapp/screens/CheckboxList.h
#	src/displayapp/screens/Clock.cpp
#	src/displayapp/screens/Clock.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
2022-09-27 21:59:22 +02:00
..
2022-06-11 22:46:38 +03:00
2022-09-17 21:27:32 +02:00
2022-09-17 21:27:32 +02:00
2022-09-17 21:27:32 +02:00
2022-09-17 21:27:32 +02:00
2022-09-17 21:27:32 +02:00
2021-07-19 16:26:12 +03:00
2022-04-25 15:59:43 +03:00
2022-01-04 01:57:18 +00:00