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

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

Fri, 18 Dec 2020 09:41:37 +0000 (10:41 +0100)

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

Fri, 18 Dec 2020 09:41:37 +0000 (10:41 +0100)
author Alekos Filini <alekos.filini@gmail.com>
Fri, 18 Dec 2020 09:41:37 +0000 (10:41 +0100)
committer Alekos Filini <alekos.filini@gmail.com>
Fri, 18 Dec 2020 09:41:37 +0000 (10:41 +0100)
diff --cc src/descriptor/dsl.rs
Simple merge
diff --cc src/keys/mod.rs
Simple merge
diff --cc src/wallet/signer.rs
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Fri, 18 Dec 2020 09:41:37 +0000 (10:41 +0100)
committer	Alekos Filini <alekos.filini@gmail.com>
	Fri, 18 Dec 2020 09:41:37 +0000 (10:41 +0100)
		1	2
src/descriptor/dsl.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/keys/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/signer.rs	patch \|	diff1 \|	diff2 \|	blob \| history