summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke_github1@dashjr.org>2017-05-12 04:14:51 +0000
committerGitHub <noreply@github.com>2017-05-12 04:14:51 +0000
commit0fbeba8bb991bb479b419785edacaf0f99c394c2 (patch)
treec7c2c175e3c7c504fe6bb84bc999397469982d8f /README.mediawiki
parent91fd4f9dae778d0959849b4e7432e3961dce661a (diff)
parentf09485e3d81f034a9a48b199562777fa9c0314fd (diff)
Merge pull request #536 from luke-jr/bip-0115
BIP 115: Generic anti-replay protection using Script
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 ee95da1..27150fd 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -505,6 +505,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0115.mediawiki|115]]
+| Consensus (soft fork)
+| Generic anti-replay protection using Script
+| Luke Dashjr
+| Standard
+| Draft
+|-
| [[bip-0120.mediawiki|120]]
| Applications
| Proof of Payment