Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware
Conflicts: app/include/user_modules.h app/include/user_version.h
This diff is collapsed.
pre_build/README.md
0 → 100644
Please register or sign in to comment
Conflicts: app/include/user_modules.h app/include/user_version.h