Skip to content

Commit 42d7ae8

Browse files
Robert SpiglerRobert Spigler
authored andcommitted
Merge branch 'bitcoin:master' into v2_Multisig_deriv
2 parents 7e10290 + 5bbfab9 commit 42d7ae8

File tree

2 files changed

+469
-0
lines changed

2 files changed

+469
-0
lines changed

README.mediawiki

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,13 @@ Those proposing changes should consider that ultimately consent may rest with th
652652
| Standard
653653
| Draft
654654
|- style="background-color: #ffffcf"
655+
| [[bip-0129.mediawiki|129]]
656+
| Applications
657+
| Bitcoin Secure Multisig Setup (BSMS)
658+
| Hugo Nguyen, Peter Gray, Marko Bencun, Aaron Chen, Rodolfo Novak
659+
| Standard
660+
| Proposed
661+
|- style="background-color: #ffffcf"
655662
| [[bip-0130.mediawiki|130]]
656663
| Peer Services
657664
| sendheaders message

0 commit comments

Comments
 (0)