Merge branch 'master' into patch-1

This commit is contained in:
Mathieu Nebra 2017-01-05 17:17:52 +01:00 committed by GitHub
commit 0a58c6d88d
7 changed files with 265 additions and 26 deletions

View file

@ -10,11 +10,16 @@ id: resources
<div class="resources">
<div>
<div>
<h2 id="useful"><img src="/img/icons/ico_simple.svg" class="titleicon" alt="Icon">{% translate useful %}</h2>
<div>
<h2 id="learn"><img src="/img/icons/ico_solve.svg" class="titleicon" alt="Icon">{% translate learn %}</h2>
<p>{% translate linkwiki %}</p>
{% if page.lang == 'fr' %}<p><a href="https://openclassrooms.com/courses/comprendre-le-bitcoin-et-la-blockchain">OpenClassrooms</a></p>{% endif %}
<p><a href="https://www.khanacademy.org/economics-finance-domain/core-finance/money-and-banking/bitcoin/v/bitcoin-what-is-it">Khan Academy</a></p>
<p><a href="http://letstalkbitcoin.com/">Let's Talk Bitcoin</a></p>
<p><a href="http://www.bitcoin.kn/">Bitcoin Knowledge Podcast</a></p>
<p><a href="https://www.weusecoins.com/">WeUseCoins.com</a></p>
<p><a href="http://www.bitcoinmining.com/">BitcoinMining.com</a></p>
<p><a href="http://www.iamsatoshi.com/category/video-archive/">IamSatoshi</a></p>
</div><div>
<h2 id="directories"><img src="/img/icons/ico_invoice.svg" class="titleicon" alt="Icon">{% translate directories %}</h2>
<p><a href="/{{ page.lang }}/{% translate choose-your-wallet url %}">{% translate linkwallets %}</a> - bitcoin.org</p>
@ -54,12 +59,10 @@ id: resources
<p><a href="http://iamsatoshi.com/">Ulterior States</a></p>
<p><a href="https://www.youtube.com/watch?v=6pWblf8COH4">The Bitcoin Phenomenon</a></p>
</div><div>
<h2 id="learn"><img src="/img/icons/ico_solve.svg" class="titleicon" alt="Icon">{% translate learn %}</h2>
{% if page.lang == 'fr' %}<p><a href="https://openclassrooms.com/courses/comprendre-le-bitcoin-et-la-blockchain">OpenClassrooms</a></p>{% endif %}
<p><a href="http://letstalkbitcoin.com/">Let's Talk Bitcoin</a></p>
<p><a href="http://www.bitcoin.kn/">Bitcoin Knowledge Podcast</a></p>
<p><a href="https://www.khanacademy.org/economics-finance-domain/core-finance/money-and-banking/bitcoin/v/bitcoin-what-is-it">Khan Academy</a></p>
<p><a href="http://www.iamsatoshi.com/category/video-archive/">IamSatoshi</a></p>
<h2 id="vouchers"><img src="/img/icons/ico_voucher.svg" class="titleicon" alt="Icon">{% translate vouchers %}</h2>
<p><a href="https://foldapp.com/">Fold</a></p>
<p><a href="https://gyft.com/bitcoin/">Gyft</a></p>
<p><a href="https://opendime.com/">Opendime</a></p>
</div>
</div>
</div>
</div>