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

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

Wed, 18 Nov 2020 09:44:54 +0000 (10:44 +0100)

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

Wed, 18 Nov 2020 09:44:54 +0000 (10:44 +0100)
author Alekos Filini <alekos.filini@gmail.com>
Wed, 18 Nov 2020 09:44:54 +0000 (10:44 +0100)
committer Alekos Filini <alekos.filini@gmail.com>
Wed, 18 Nov 2020 09:44:54 +0000 (10:44 +0100)
diff --cc Cargo.toml
Simple merge
diff --cc src/wallet/mod.rs
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Wed, 18 Nov 2020 09:44:54 +0000 (10:44 +0100)
committer	Alekos Filini <alekos.filini@gmail.com>
	Wed, 18 Nov 2020 09:44:54 +0000 (10:44 +0100)
		1	2
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history