Matteo Albinola 097d51ea72 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-05 09:07:03 +02:00
..
bg-BG.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
cs-CZ.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
de-DE.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
el-GR.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
en-GB.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
es-ES.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
fr-FR.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
he-HE.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
hu-HU.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
it-IT.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
ko-KO.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
nl-NL.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
pl-PL.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
pt-BR.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
pt-PT.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
ro-RO.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
ru-RU.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
sk-SK.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
sv-SE.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
tr-TR.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
uk-UA.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
zh-CN.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00
zh-TW.h	Merge branch 'development' into new-windmeter-sensor	2020-05-05 09:07:03 +02:00