Jean-François Milants 87d882b151 Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat ... # Conflicts: # src/components/datetime/DateTimeController.cpp		2022-02-13 11:23:05 +01:00
..
Settings.cpp	Update includes to to be relative to src directory	2021-11-15 22:02:49 +01:00
Settings.h	Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat	2022-02-13 11:23:05 +01:00