summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke_github1@dashjr.org>2017-05-07 22:15:14 +0000
committerGitHub <noreply@github.com>2017-05-07 22:15:14 +0000
commit9cafe77c566779fd0f5dfc267a770e0bbe7f95fb (patch)
tree7025e0650182d3bf8421920b38d279c2741dab4a /README.mediawiki
parentb9625408cf04bef761a7e45be3a27601128eb2ea (diff)
parent3b3a9db960f98c6ea2c370f78fc4113a0761aeff (diff)
downloadbips-9cafe77c566779fd0f5dfc267a770e0bbe7f95fb.tar.xz
Merge pull request #532 from sanch0panza/bip-genvbvoting-squash
BIP 135: Generalized version bits voting
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 5edf334..d31a620 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -589,6 +589,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0135.mediawiki|135]]
+|
+| Generalized version bits voting
+| Sancho Panza
+| Informational
+| Draft
+|-
| [[bip-0140.mediawiki|140]]
| Consensus (soft fork)
| Normalized TXID