Moirtz Wagner bfcb43d22b Merge branch 'tahoma'
# Conflicts:
#	Raumtermostat/.vscode/settings.json
#	Raumtermostat/platformio.ini
#	Raumtermostat/src/lv_conf.h
#	Raumtermostat/src/main.cpp
#	Raumtermostat/src/tahoma.cpp
#	Raumtermostat/src/tahoma.h
#	Raumtermostat/src/ui/Bootstrap_Icons_12.c
#	Raumtermostat/src/ui/Bootstrap_Icons_16.c
#	Raumtermostat/src/ui/Bootstrap_Icons_18.c
#	Raumtermostat/src/ui/Bootstrap_Icons_20.c
#	Raumtermostat/src/ui/actions.cpp
#	Raumtermostat/src/ui/actions.h
#	Raumtermostat/src/ui/screens.c
#	Raumtermostat/src/ui/screens.h
#	Raumtermostat/src/ui/styles.c
#	Raumtermostat/src/ui/styles.h
#	Raumtermostat/src/ui/symbols.h
#	Raumtermostat/src/ui/ui.cpp
2026-01-05 11:00:41 +01:00
..
2025-11-16 09:52:56 +01:00
2025-03-21 09:59:09 +01:00
2025-11-16 09:52:56 +01:00
2026-01-05 11:00:41 +01:00
2025-03-21 09:59:09 +01:00
2025-03-21 09:59:09 +01:00