Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware
Conflicts: app/include/user_modules.h app/include/user_version.h
app/spiffs/test/main.c
0 → 100644
app/spiffs/test/test_check.c
0 → 100644
app/spiffs/test/test_dev.c
0 → 100644
app/spiffs/test/testrunner.c
0 → 100644
app/spiffs/test/testrunner.h
0 → 100644
app/spiffs/test/testsuites.c
0 → 100644
Please register or sign in to comment