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

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

Thu, 15 Apr 2021 09:40:34 +0000 (11:40 +0200)

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

Thu, 15 Apr 2021 09:40:34 +0000 (11:40 +0200)
author Alekos Filini <alekos.filini@gmail.com>
Thu, 15 Apr 2021 09:40:34 +0000 (11:40 +0200)
committer Alekos Filini <alekos.filini@gmail.com>
Thu, 15 Apr 2021 09:40:34 +0000 (11:40 +0200)
diff --cc .github/workflows/cont_integration.yml
Simple merge
diff --cc src/wallet/mod.rs
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Thu, 15 Apr 2021 09:40:34 +0000 (11:40 +0200)
committer	Alekos Filini <alekos.filini@gmail.com>
	Thu, 15 Apr 2021 09:40:34 +0000 (11:40 +0200)
		1	2
.github/workflows/cont_integration.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history