Matteo Albinola
|
a3455f235b
|
Merge branch 'development' into new-windmeter-sensor
# Conflicts:
# tasmota/language/bg_BG.h
# tasmota/language/cs_CZ.h
# tasmota/language/de_DE.h
# tasmota/language/el_GR.h
# tasmota/language/en_GB.h
# tasmota/language/es_ES.h
# tasmota/language/fr_FR.h
# tasmota/language/he_HE.h
# tasmota/language/hu_HU.h
# tasmota/language/it_IT.h
# tasmota/language/ko_KO.h
# tasmota/language/nl_NL.h
# tasmota/language/pl_PL.h
# tasmota/language/pt_BR.h
# tasmota/language/pt_PT.h
# tasmota/language/ro_RO.h
# tasmota/language/ru_RU.h
# tasmota/language/sk_SK.h
# tasmota/language/sv_SE.h
# tasmota/language/tr_TR.h
# tasmota/language/uk_UA.h
# tasmota/language/zh_CN.h
# tasmota/language/zh_TW.h
|
2020-05-06 21:33:07 +02:00 |