Blaz Kristan 29e048af7b Merge branch 'master' into dev ... Conflicts: CHANGELOG.md package.json platformio.ini usermods/Temperature/usermod_temperature.h wled00/FX.cpp wled00/FX.h wled00/FX_fcn.cpp wled00/cfg.cpp wled00/data/index.js wled00/data/settings_leds.htm wled00/data/settings_time.htm wled00/data/style.css wled00/html_other.h wled00/html_settings.h wled00/html_ui.h wled00/ntp.cpp wled00/usermods_list.cpp wled00/wled.cpp wled00/wled.h		2021-04-14 18:19:51 +02:00
..
cdata.js	1st working usermod settings (Temperature).	2021-04-10 00:17:15 +02:00
WLED_ESP32_8MB.csv	Updated codm environments	2021-04-10 12:22:09 +02:00