diff options
| author | Luke Dashjr <luke_github1@dashjr.org> | 2020-10-05 16:03:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 16:03:40 +0000 |
| commit | 2853268a2d802322296851e55317ccee69c77771 (patch) | |
| tree | 7ed59c47f9d48f2a5d5255fc0b6533c6b4632d40 /README.mediawiki | |
| parent | 94073deb66c771918e29668262b62983224ea778 (diff) | |
| parent | 3711a828afced7c3ee20a7ef420892988b505216 (diff) | |
| download | bips-2853268a2d802322296851e55317ccee69c77771.tar.xz | |
Merge pull request #973 from ysangkok/expire-bip-0114
Reject 114 (expired)
Diffstat (limited to 'README.mediawiki')
| -rw-r--r-- | README.mediawiki | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/README.mediawiki b/README.mediawiki index ca28339..73a71a6 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -546,13 +546,13 @@ Those proposing changes should consider that ultimately consent may rest with th | Thomas Kerin, Mark Friedenbach | Standard | Final -|- +|- style="background-color: #ffcfcf" | [[bip-0114.mediawiki|114]] | Consensus (soft fork) | Merkelized Abstract Syntax Tree | Johnson Lau | Standard -| Draft +| Rejected |- style="background-color: #ffcfcf" | [[bip-0115.mediawiki|115]] | Consensus (soft fork) |