Merge remote-tracking branch 'origin/Over_The_Air_Update' into

Over_The_Air_Update

Conflicts:
	components/wifi-manager/http_server.c
	components/wifi-manager/wifi_manager.c
This commit is contained in:
Sebastien
2019-09-22 22:35:22 -04:00
2 changed files with 1 additions and 2 deletions

View File

@@ -355,7 +355,6 @@ void http_server_netconn_serve(struct netconn *conn) {
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); //200ok
}
}
else{
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);