Commit Graph

154 Commits

Author SHA1 Message Date
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
Mickael Gaillard d54dcec303 Custom configuration tntegration on core
Signed-off-by: Mickael Gaillard <mick.gaillard@gmail.com>
2020-05-06 21:30:36 +02:00
Theo Arends 93ac75a5aa Prep ESP32 Webcam for user template 2020-05-05 18:36:12 +02:00
Theo Arends 50614a18b5 Rename language files to fix compilation error 2020-05-05 17:09:48 +02:00