summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorMark "Murch" Erhardt <murch@murch.one>2024-05-06 14:02:38 -0400
committerGitHub <noreply@github.com>2024-05-06 14:02:38 -0400
commitfeacf8f2ed1ea3f95362a9933697d05ab979663d (patch)
tree99f6197ba0674b590a79972e0ed61407c61871bc /README.mediawiki
parent8808e78883e4bf956d22acaa392625d963eff6dd (diff)
parent7ad0f821ddc60366e98344a1e3019114ae46c80f (diff)
downloadbips-feacf8f2ed1ea3f95362a9933697d05ab979663d.tar.xz
Merge pull request #1525 from EthanHeilman/cat
BIP 347: OP_CAT in Tapscript
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 94ecb8b..41efcd4 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -1085,6 +1085,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| James O'Beirne, Greg Sanders, Anthony Towns
| Standard
| Draft
+|-
+| [[bip-0347.mediawiki|347]]
+| Consensus (soft fork)
+| OP_CAT in Tapscript
+| Ethan Heilman, Armin Sabouri
+| Standard
+| Draft
|- style="background-color: #cfffcf"
| [[bip-0350.mediawiki|350]]
| Applications