Merge pull request #1425 from valentinewallace/2021-04-wumbo

author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>

Thu, 28 Apr 2022 21:14:19 +0000 (21:14 +0000)

committer GitHub <noreply@github.com>

Thu, 28 Apr 2022 21:14:19 +0000 (21:14 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 28 Apr 2022 21:14:19 +0000 (21:14 +0000)
committer GitHub <noreply@github.com>
Thu, 28 Apr 2022 21:14:19 +0000 (21:14 +0000)
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Thu, 28 Apr 2022 21:14:19 +0000 (21:14 +0000)
committer	GitHub <noreply@github.com>
	Thu, 28 Apr 2022 21:14:19 +0000 (21:14 +0000)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history