summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke_github1@dashjr.org>2020-07-13 03:24:02 +0000
committerGitHub <noreply@github.com>2020-07-13 03:24:02 +0000
commit5cc0c6fb498efdc35debc17c044ee9ccaa13f0ce (patch)
tree0f5c90ce2f5836762645de5abce377b370eb6873 /README.mediawiki
parent1515e3ddc9c5c0a8b9d221a5df94f8270e3c7abb (diff)
parenta2346e5a54ac6eb0a2ca1d342d039826e9889e42 (diff)
Merge pull request #938 from ysangkok/expired-bip-0115
Reject 115 (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 642c429..7a44341 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -553,13 +553,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Johnson Lau
| Standard
| Draft
-|-
+|- style="background-color: #ffcfcf"
| [[bip-0115.mediawiki|115]]
| Consensus (soft fork)
| Generic anti-replay protection using Script
| Luke Dashjr
| Standard
-| Draft
+| Rejected
|-
| [[bip-0116.mediawiki|116]]
| Consensus (soft fork)