summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke-Jr <luke_github1@dashjr.org>2016-09-23 10:27:43 +0000
committerGitHub <noreply@github.com>2016-09-23 10:27:43 +0000
commitb11eca4750309ef75ec30eeedf7d5e318d701b46 (patch)
tree528f6a62f48f311aa94c45f8ab60e49dd1ec8808 /README.mediawiki
parent8f8ac4f2f88ae6c6029a07452695606590e63b79 (diff)
parentb3654088ccc7d78f5ce45b1b3e68a4dd9e06658c (diff)
downloadbips-b11eca4750309ef75ec30eeedf7d5e318d701b46.tar.xz
Merge pull request #445 from zander/FlexTrans
BIP 134: Flexible Transactions
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 0f0f9e1..1b29321 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -476,6 +476,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0134.mediawiki|134]]
+| Flexible Transactions
+| Tom Zander
+| Standard
+| Draft
+|-
| [[bip-0140.mediawiki|140]]
| Normalized TXID
| Christian Decker