Blaz Kristan
bfd7be543a
Merge branch 'master' of https://github.com/aircoookie/WLED into dev
Conflicts:
tools/cdata.js
usermods/PIR_sensor_switch/readme.md
usermods/Temperature/readme.md
wled00/FX.h
wled00/FX_fcn.cpp
wled00/bus_manager.h
wled00/bus_wrapper.h
wled00/cfg.cpp
wled00/const.h
wled00/data/settings.htm
wled00/data/settings_leds.htm
wled00/data/settings_um.htm
wled00/html_settings.h
wled00/json.cpp
wled00/mqtt.cpp
wled00/set.cpp
wled00/wled.cpp
wled00/wled.h
wled00/wled_eeprom.cpp
wled00/wled_server.cpp
wled00/xml.cpp
2021-05-18 15:45:34 +02:00
..
2021-05-11 23:21:57 +02:00
2021-04-30 00:00:46 +02:00
2021-04-30 00:00:46 +02:00
2021-04-10 12:22:09 +02:00
2021-05-07 12:57:58 +02:00