Commit graph

2 commits

Author SHA1 Message Date
lumapu
c8a05efadc Merge branch 'main' into dev
# Conflicts:
#	tools/esp8266/defines.h
#	tools/esp8266/hmSystem.h
2022-04-29 20:49:50 +02:00
lumapu
5844795447 Merge branch 'main' into dev
# Conflicts:
#	tools/esp8266/app.cpp
#	tools/esp8266/hmInverters.h
#	tools/esp8266/hmSystem.h

* added missing files
2022-04-27 23:27:52 +02:00