Merge pull request #368 from johnnynanjiang/elastos-pr

author iancoleman <1281387+iancoleman@users.noreply.github.com>

Sun, 10 Nov 2019 22:47:35 +0000 (09:47 +1100)

committer GitHub <noreply@github.com>

Sun, 10 Nov 2019 22:47:35 +0000 (09:47 +1100)
author iancoleman <1281387+iancoleman@users.noreply.github.com>
Sun, 10 Nov 2019 22:47:35 +0000 (09:47 +1100)
committer GitHub <noreply@github.com>
Sun, 10 Nov 2019 22:47:35 +0000 (09:47 +1100)
diff --cc src/index.html
Simple merge
diff --cc src/js/index.js
Simple merge
author	iancoleman <1281387+iancoleman@users.noreply.github.com>
	Sun, 10 Nov 2019 22:47:35 +0000 (09:47 +1100)
committer	GitHub <noreply@github.com>
	Sun, 10 Nov 2019 22:47:35 +0000 (09:47 +1100)
		1	2
src/index.html	patch \|	diff1 \|	diff2 \|	blob \| history
src/js/index.js	patch \|	diff1 \|	diff2 \|	blob \| history