summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorRobert Spigler <RobertSpigler@ProtonMail.ch>2021-05-15 00:46:03 -0400
committerRobert Spigler <RobertSpigler@ProtonMail.ch>2021-05-15 00:46:03 -0400
commit42d7ae8c09bfc5e405f9984eafff1bd0225ef468 (patch)
treed8f8fe409d46932ed1d3af8ee469d3b099a3838a /README.mediawiki
parent7e10290920a8e609f1fed52b1c953a8fe7e6ad41 (diff)
parent5bbfab9c565b6d2acd60446b913eb32a510709a7 (diff)
downloadbips-42d7ae8c09bfc5e405f9984eafff1bd0225ef468.tar.xz
Merge branch 'bitcoin:master' into v2_Multisig_deriv
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 34cf740..3d4abfe 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -652,6 +652,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|- style="background-color: #ffffcf"
+| [[bip-0129.mediawiki|129]]
+| Applications
+| Bitcoin Secure Multisig Setup (BSMS)
+| Hugo Nguyen, Peter Gray, Marko Bencun, Aaron Chen, Rodolfo Novak
+| Standard
+| Proposed
+|- style="background-color: #ffffcf"
| [[bip-0130.mediawiki|130]]
| Peer Services
| sendheaders message