Merge branch 'feature/esp-https-ota-basic-auth' into 'master'

author Angus Gratton <angus@espressif.com>

Fri, 10 May 2019 04:39:14 +0000 (12:39 +0800)

committer Angus Gratton <angus@espressif.com>

Fri, 10 May 2019 04:39:14 +0000 (12:39 +0800)
author Angus Gratton <angus@espressif.com>
Fri, 10 May 2019 04:39:14 +0000 (12:39 +0800)
committer Angus Gratton <angus@espressif.com>
Fri, 10 May 2019 04:39:14 +0000 (12:39 +0800)
diff --cc components/esp_http_client/esp_http_client.c
Simple merge
diff --cc components/esp_http_client/include/esp_http_client.h
Simple merge
author	Angus Gratton <angus@espressif.com>
	Fri, 10 May 2019 04:39:14 +0000 (12:39 +0800)
committer	Angus Gratton <angus@espressif.com>
	Fri, 10 May 2019 04:39:14 +0000 (12:39 +0800)
		1	2
components/esp_http_client/esp_http_client.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp_http_client/include/esp_http_client.h	patch \|	diff1 \|	diff2 \|	blob \| history