Merge branch 'master' into httpd

Conflicts:
	components/wifi-manager/http_server.c
	components/wifi-manager/wifi_manager.c
	main/config.c
	main/config.h
This commit is contained in:
Sebastien
2020-01-22 15:13:18 -05:00
122 changed files with 9091 additions and 588 deletions

View File

@@ -4,5 +4,6 @@ idf_component_register(SRCS "dns_server.c" "http_server.c" "wifi_manager.c"
PRIV_REQUIRES newlib freertos spi_flash nvs_flash mdns pthread wpa_supplicant cmd_system esp_http_server
EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
)