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

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

Wed, 17 Mar 2021 10:30:31 +0000 (11:30 +0100)

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

Wed, 17 Mar 2021 10:30:31 +0000 (11:30 +0100)
author Alekos Filini <alekos.filini@gmail.com>
Wed, 17 Mar 2021 10:30:31 +0000 (11:30 +0100)
committer Alekos Filini <alekos.filini@gmail.com>
Wed, 17 Mar 2021 10:30:31 +0000 (11:30 +0100)
diff --cc CHANGELOG.md
Simple merge
diff --cc src/descriptor/policy.rs
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Wed, 17 Mar 2021 10:30:31 +0000 (11:30 +0100)
committer	Alekos Filini <alekos.filini@gmail.com>
	Wed, 17 Mar 2021 10:30:31 +0000 (11:30 +0100)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/descriptor/policy.rs	patch \|	diff1 \|	diff2 \|	blob \| history