Jean-François Milants 738c012a73 Merge branch 'pts-options' of github.com:kieranc/InfiniTime into kieranc-pts-options ... # Conflicts: # src/components/settings/Settings.h		2022-10-02 18:30:41 +02:00
..
Settings.cpp	Apply clang-format to all C++ files	2022-06-05 09:15:46 +03:00
Settings.h	Merge branch 'pts-options' of github.com:kieranc/InfiniTime into kieranc-pts-options	2022-10-02 18:30:41 +02:00