]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #145 from TheBlueMatt/2018-09-134-rebased
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
committerGitHub <noreply@github.com>
Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
#134 rebased

1  2 
src/ln/channel.rs
src/ln/channelmanager.rs

Simple merge
Simple merge