Merge pull request #12 from apoelstra/patch-2
authorMatt Corallo <github@bluematt.me>
Mon, 24 Aug 2015 01:31:58 +0000 (18:31 -0700)
committerMatt Corallo <github@bluematt.me>
Mon, 24 Aug 2015 01:31:58 +0000 (18:31 -0700)
Add link to gmax's hardfork wishlist

1  2 
index.html

diff --cc index.html
Simple merge