Upstream merge.

This commit is contained in:
md_5 2015-01-05 14:32:01 +11:00 committed by Zach Brown
parent 6ae735e2e3
commit 384699a51a
188 changed files with 247 additions and 253 deletions

View file

@ -1,4 +1,4 @@
From 153ca8d846ba5d85fae7bca99b92cea7d7d1a50a Mon Sep 17 00:00:00 2001
From dddf63f99fe12e810fec21e34b24dadbc4e2f6ab Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API