Sebastien
|
6cf04a3a83
|
Merge branch 'master' into nvs_parameters
# Conflicts:
# .cproject
# Makefile
# README.md
# components/cmd_nvs/cmd_nvs.c
# components/cmd_system/cmd_system.c
# components/cmd_system/cmd_system.h
# components/driver_bt/CMakeLists.txt
# components/wifi-manager/CMakeLists.txt
# components/wifi-manager/Kconfig.projbuild
# components/wifi-manager/code.js
# components/wifi-manager/component.mk
# components/wifi-manager/dns_server.c
# components/wifi-manager/dns_server.h
# components/wifi-manager/http_server.c
# components/wifi-manager/http_server.h
# components/wifi-manager/index.html
# components/wifi-manager/style.css
# components/wifi-manager/wifi_manager.c
# components/wifi-manager/wifi_manager.h
# main/CMakeLists.txt
# main/console.c
# main/esp_app_main.c
# sdkconfig.defaults
|
2019-10-17 12:45:26 -04:00 |
|