Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware
Conflicts: app/include/user_version.h app/modules/node.c app/modules/wifi.c
examples/init.lua
0 → 100644
examples/user.lua
0 → 100644
Please register or sign in to comment