Merge branch 'master' into patch-11

This commit is contained in:
i-rme 2017-02-11 17:35:28 +01:00 committed by GitHub
commit 9ece6761a0
42 changed files with 1383 additions and 296 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="https://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>
@ -35,7 +40,6 @@ id: resources
<p><a href="http://coinspot.ru/">CoinSpot</a></p>{% endif %}
<p>{% translate linkcointelegraph %}<p>
<p><a href="http://www.coindesk.com/">CoinDesk</a></p>
<p><a href="https://www.cryptocoinsnews.com/">CryptoCoinsNews</a></p>
<p><a href="https://bitcoinmagazine.com/">Bitcoin Magazine</a></p>
<p><a href="http://coinjournal.net/">CoinJournal</a></p>
{% if page.lang == 'ru' %}<p><a href="https://bitcointalk.org/index.php?board=128.0">Биткойн Форум / Новости</a></p>{% else %}<p><a href="https://bitcointalk.org/index.php?board=77.0">BitcoinTalk press links</a></p>{% endif %}
@ -55,11 +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>
<p><a href="https://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>