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-08-02 22:49:12 +02:00
2022-08-02 22:49:12 +02:00
2022-09-17 21:27:32 +02:00
2022-06-05 09:15:46 +03:00
2022-09-17 21:27:32 +02:00
2022-09-17 21:27:32 +02:00
2022-06-05 09:15:46 +03:00
2022-06-05 09:15:46 +03:00
2022-06-05 09:31:23 +03:00
2022-08-02 22:51:59 +02:00
2022-08-02 22:49:12 +02:00
2022-09-11 20:57:49 +02:00
2022-09-11 20:57:49 +02:00
2022-08-02 22:49:12 +02:00
2022-09-11 20:18:01 +02:00