Merge branch 'feature/micro-ecc-only-in-bootloader' into 'master'

author Angus Gratton <angus@espressif.com>

Thu, 4 Apr 2019 06:26:48 +0000 (14:26 +0800)

committer Angus Gratton <angus@espressif.com>

Thu, 4 Apr 2019 06:26:48 +0000 (14:26 +0800)
author Angus Gratton <angus@espressif.com>
Thu, 4 Apr 2019 06:26:48 +0000 (14:26 +0800)
committer Angus Gratton <angus@espressif.com>
Thu, 4 Apr 2019 06:26:48 +0000 (14:26 +0800)
diff --cc .flake8
Simple merge
diff --cc .gitlab-ci.yml
Simple merge
diff --cc .gitmodules
Simple merge
diff --cc tools/ci/mirror-list.txt
Simple merge
author	Angus Gratton <angus@espressif.com>
	Thu, 4 Apr 2019 06:26:48 +0000 (14:26 +0800)
committer	Angus Gratton <angus@espressif.com>
	Thu, 4 Apr 2019 06:26:48 +0000 (14:26 +0800)
		1	2
.flake8	patch \|	diff1 \|	diff2 \|	blob \| history
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
.gitmodules	patch \|	diff1 \|	diff2 \|	blob \| history
tools/ci/mirror-list.txt	patch \|	diff1 \|	diff2 \|	blob \| history