summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke-Jr <luke_github1@dashjr.org>2015-09-05 20:29:23 +0000
committerLuke-Jr <luke_github1@dashjr.org>2015-09-05 20:29:23 +0000
commita0837d35c65b4165f472a7e7af70b4f98722e50c (patch)
tree34b5b197400dd97febc1c4727b530fb8cc121ce7 /README.mediawiki
parent2e0d3412546e28da19c8ab6cc0056fc05542acac (diff)
parent925b89d246a8870b74478fc5b2d50742a26e1c39 (diff)
Merge pull request #193 from UpalChakraborty/patch-2
Update README.mediawiki
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 6dfa719..1404eb6 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -302,6 +302,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0106.mediawiki|106]]
+| Dynamically Controlled Bitcoin Block Size Max Cap
+| Upal Chakraborty
+| Standard
+| Draft
+|-
| [[bip-0111.mediawiki|111]]
| NODE_BLOOM service bit
| Matt Corallo and Peter Todd