diff options
| author | Luke Dashjr <luke_github1@dashjr.org> | 2018-02-10 22:16:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 22:16:31 +0000 |
| commit | e38387e17557b3b4102d17701e216a2059d84a8d (patch) | |
| tree | 335969db90097093537d123786c1d71b6b6bd06d | |
| parent | 2d5fc7acb2c2d15f3941f93ec38576c0ebf4e17f (diff) | |
| parent | a7819e43c66358854bd17ae8d54a4ccfc40c9712 (diff) | |
| download | bips-e38387e17557b3b4102d17701e216a2059d84a8d.tar.xz | |
Merge pull request #645 from kallerosenbaum/master
Withdrawing BIP120/121 due to security issues during soft-forks
| -rw-r--r-- | README.mediawiki | 8 | ||||
| -rw-r--r-- | bip-0120.mediawiki | 2 | ||||
| -rw-r--r-- | bip-0121.mediawiki | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/README.mediawiki b/README.mediawiki index bcc1e3f..efd037b 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -546,20 +546,20 @@ Those proposing changes should consider that ultimately consent may rest with th | Mark Friedenbach, Kalle Alm, BtcDrak | Standard | Draft -|- +|- style="background-color: #ffcfcf" | [[bip-0120.mediawiki|120]] | Applications | Proof of Payment | Kalle Rosenbaum | Standard -| Draft -|- +| Withdrawn +|- style="background-color: #ffcfcf" | [[bip-0121.mediawiki|121]] | Applications | Proof of Payment URI scheme | Kalle Rosenbaum | Standard -| Draft +| Withdrawn |- | [[bip-0122.mediawiki|122]] | Applications diff --git a/bip-0120.mediawiki b/bip-0120.mediawiki index d48cdfa..b951e93 100644 --- a/bip-0120.mediawiki +++ b/bip-0120.mediawiki @@ -5,7 +5,7 @@ Author: Kalle Rosenbaum <kalle@rosenbaum.se> Comments-Summary: No comments yet. Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0120 - Status: Draft + Status: Withdrawn Type: Standards Track Created: 2015-07-28 </pre> diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki index 34820f5..1b01a0b 100644 --- a/bip-0121.mediawiki +++ b/bip-0121.mediawiki @@ -5,7 +5,7 @@ Author: Kalle Rosenbaum <kalle@rosenbaum.se> Comments-Summary: No comments yet. Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0121 - Status: Draft + Status: Withdrawn Type: Standards Track Created: 2015-07-27 </pre> |