Merge commit 'refs/pull/174/head' of github.com:bitcoindevkit/bdk

author Alekos Filini <alekos.filini@gmail.com>

Fri, 22 Jan 2021 15:38:17 +0000 (10:38 -0500)

committer Alekos Filini <alekos.filini@gmail.com>

Fri, 22 Jan 2021 15:38:17 +0000 (10:38 -0500)
author Alekos Filini <alekos.filini@gmail.com>
Fri, 22 Jan 2021 15:38:17 +0000 (10:38 -0500)
committer Alekos Filini <alekos.filini@gmail.com>
Fri, 22 Jan 2021 15:38:17 +0000 (10:38 -0500)
diff --cc CHANGELOG.md
Simple merge
diff --cc Cargo.toml
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Fri, 22 Jan 2021 15:38:17 +0000 (10:38 -0500)
committer	Alekos Filini <alekos.filini@gmail.com>
	Fri, 22 Jan 2021 15:38:17 +0000 (10:38 -0500)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history