Merge pull request #1419 from atalw/2022-03-paymentforwarded-event

author valentinewallace <valentinewallace@users.noreply.github.com>

Wed, 20 Apr 2022 15:37:48 +0000 (11:37 -0400)

committer GitHub <noreply@github.com>

Wed, 20 Apr 2022 15:37:48 +0000 (11:37 -0400)
author valentinewallace <valentinewallace@users.noreply.github.com>
Wed, 20 Apr 2022 15:37:48 +0000 (11:37 -0400)
committer GitHub <noreply@github.com>
Wed, 20 Apr 2022 15:37:48 +0000 (11:37 -0400)
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
author	valentinewallace <valentinewallace@users.noreply.github.com>
	Wed, 20 Apr 2022 15:37:48 +0000 (11:37 -0400)
committer	GitHub <noreply@github.com>
	Wed, 20 Apr 2022 15:37:48 +0000 (11:37 -0400)
		1	2
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_test_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history