Merge pull request #355 from zhanghangorg/master

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

Thu, 12 Sep 2019 00:14:33 +0000 (10:14 +1000)

committer GitHub <noreply@github.com>

Thu, 12 Sep 2019 00:14:33 +0000 (10:14 +1000)
author iancoleman <1281387+iancoleman@users.noreply.github.com>
Thu, 12 Sep 2019 00:14:33 +0000 (10:14 +1000)
committer GitHub <noreply@github.com>
Thu, 12 Sep 2019 00:14:33 +0000 (10:14 +1000)
diff --cc src/js/index.js
Simple merge
diff --cc tests/spec/tests.js
Simple merge
author	iancoleman <1281387+iancoleman@users.noreply.github.com>
	Thu, 12 Sep 2019 00:14:33 +0000 (10:14 +1000)
committer	GitHub <noreply@github.com>
	Thu, 12 Sep 2019 00:14:33 +0000 (10:14 +1000)
		1	2
src/js/index.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/spec/tests.js	patch \|	diff1 \|	diff2 \|	blob \| history