From: Matt Corallo <github@bluematt.me>
Date: Mon, 24 Aug 2015 01:31:58 +0000 (-0700)
Subject: Merge pull request #12 from apoelstra/patch-2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=bitcoinninja;a=commitdiff_plain;h=d0a96c4ce336d83773543b1ad8bb70c1dc5656af;hp=6c98544b44baf3815a970792cbdaef8fd28adcfc

Merge pull request #12 from apoelstra/patch-2

Add link to gmax's hardfork wishlist
---

diff --git a/index.html b/index.html
index fe09473..a7a25bb 100644
--- a/index.html
+++ b/index.html
@@ -23,6 +23,7 @@ Useful resources:
 <li><a href="http://download.wpsoftware.net/bitcoin/wizards/">Old #bitcoin-wizards logs here</a></li>
 <li><a href="http://bitcoin.sipa.be/">Sipa's hashrate statistics</a></li>
 <li><a href="https://en.bitcoin.it/wiki/User:Gmaxwell/alt_ideas">Gmaxwell's alt-ideas page</a></li>
+<li><a herf="https://en.bitcoin.it/wiki/Hardfork_Wishlist">Hardfork wishlist</a></li>
 <li><a href="http://diyhpl.us/~bryan/papers2/bitcoin/">Bitcoin-related papers archived by kanzure</a></li>
 </ul>