Merge pull request #911 from TheBlueMatt/2021-05-fix-cltv-diff
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 6 May 2021 21:49:24 +0000 (21:49 +0000)
committerGitHub <noreply@github.com>
Thu, 6 May 2021 21:49:24 +0000 (21:49 +0000)
1  2 
lightning/src/chain/channelmonitor.rs
lightning/src/ln/channelmanager.rs

Simple merge
Simple merge