Merge branch 'feature/derive_esp_wifi_from_esp32' into 'master'

author Ivan Grokhotkov <ivan@espressif.com>

Tue, 2 Apr 2019 02:13:15 +0000 (10:13 +0800)

committer Ivan Grokhotkov <ivan@espressif.com>

Tue, 2 Apr 2019 02:13:15 +0000 (10:13 +0800)
author Ivan Grokhotkov <ivan@espressif.com>
Tue, 2 Apr 2019 02:13:15 +0000 (10:13 +0800)
committer Ivan Grokhotkov <ivan@espressif.com>
Tue, 2 Apr 2019 02:13:15 +0000 (10:13 +0800)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc docs/Doxyfile
Simple merge
author	Ivan Grokhotkov <ivan@espressif.com>
	Tue, 2 Apr 2019 02:13:15 +0000 (10:13 +0800)
committer	Ivan Grokhotkov <ivan@espressif.com>
	Tue, 2 Apr 2019 02:13:15 +0000 (10:13 +0800)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
docs/Doxyfile	patch \|	diff1 \|	diff2 \|	blob \| history