summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke_github1@dashjr.org>2020-08-20 22:07:58 +0000
committerGitHub <noreply@github.com>2020-08-20 22:07:58 +0000
commit185527510cd71cc9ad124b6de4aea2c2d868b1d6 (patch)
treee31862efc2811c76b71341ccce6f4f8eab7dce54 /README.mediawiki
parentee43d1c64b4e343b97e6a520151b8dbeab0a1e7a (diff)
parent1c6cdff42c0107ad0baa15c30260a3f3e3f4bfc1 (diff)
downloadbips-185527510cd71cc9ad124b6de4aea2c2d868b1d6.tar.xz
Merge pull request #957 from ysangkok/expire-bip-0134
Reject 134 (expired)
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.mediawiki b/README.mediawiki
index e14ea5e..6640e07 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -672,13 +672,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Alex Morcos
| Standard
| Draft
-|-
+|- style="background-color: #ffcfcf"
| [[bip-0134.mediawiki|134]]
| Consensus (hard fork)
| Flexible Transactions
| Tom Zander
| Standard
-| Draft
+| Rejected
|-
| [[bip-0135.mediawiki|135]]
|