Merge pull request #451 from Alanscut/20200324

author Alan Wang <wp_scut@163.com>

Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)

committer GitHub <noreply@github.com>

Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)
author Alan Wang <wp_scut@163.com>
Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)
committer GitHub <noreply@github.com>
Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)
diff --cc README.md
Simple merge
diff --cc cJSON.c
Simple merge
diff --cc cJSON.h
Simple merge
diff --cc tests/misc_tests.c
Simple merge
author	Alan Wang <wp_scut@163.com>
	Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)
committer	GitHub <noreply@github.com>
	Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
cJSON.c	patch \|	diff1 \|	diff2 \|	blob \| history
cJSON.h	patch \|	diff1 \|	diff2 \|	blob \| history
tests/misc_tests.c	patch \|	diff1 \|	diff2 \|	blob \| history