Merge pull request #213 from charlesrocket/upd-axe

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

Wed, 9 May 2018 22:41:16 +0000 (08:41 +1000)

committer GitHub <noreply@github.com>

Wed, 9 May 2018 22:41:16 +0000 (08:41 +1000)
author iancoleman <1281387+iancoleman@users.noreply.github.com>
Wed, 9 May 2018 22:41:16 +0000 (08:41 +1000)
committer GitHub <noreply@github.com>
Wed, 9 May 2018 22:41:16 +0000 (08:41 +1000)
diff --cc src/js/bitcoinjs-extensions.js
Simple merge
diff --cc src/js/index.js
Simple merge
author	iancoleman <1281387+iancoleman@users.noreply.github.com>
	Wed, 9 May 2018 22:41:16 +0000 (08:41 +1000)
committer	GitHub <noreply@github.com>
	Wed, 9 May 2018 22:41:16 +0000 (08:41 +1000)
		1	2
src/js/bitcoinjs-extensions.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/js/index.js	patch \|	diff1 \|	diff2 \|	blob \| history