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

@ -74,15 +74,15 @@ id: community
<a href="https://bitcoin.asn.au/">Bitcoin Australia</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="austria"><img src="/img/flags/AT.png" alt="Austrian flag">Austria</h3>
<p>
<a href="http://bitcoin-austria.at/">Bitcoin Austria</a>
</p>
</div>
<div>
</div>
</div>
<div>
<div>
<h3 id="belgium"><img src="/img/flags/BE.png" alt="Belgian flag">Belgium</h3>
<p>
<a href="http://www.bitcoinassociation.be/">Belgian Bitcoin Association</a>
@ -95,14 +95,14 @@ id: community
<a href="http://www.bitcoinalliance.ca/">Bitcoin Alliance of Canada</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="denmark"><img src="/img/flags/DK.png" alt="Danish flag">Denmark</h3>
<p>
<a href="http://www.danskbitcoinforening.dk/">Dansk Bitcoinforening</a><br>
</p>
</div>
</div>
<div>
<div>
<h3 id="france"><img src="/img/flags/FR.png" alt="French flag">France</h3>
<p>
@ -115,14 +115,14 @@ id: community
<a href="http://www.bundesverband-bitcoin.de/">Bundesverband Bitcoin e.V.</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="india"><img src="/img/flags/IN.png" alt="Indian flag">India</h3>
<p>
<a href="http://www.bitcoinalliance.in/">Bitcoin Alliance of India</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="ireland"><img src="/img/flags/IE.png" alt="Irish flag">Ireland</h3>
<p>
@ -135,14 +135,14 @@ id: community
<a href="http://www.bitcoin.org.il/">איגוד הביטקוין הישראלי</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="italy"><img src="/img/flags/IT.png" alt="Italian flag">Italy</h3>
<p>
<a href="https://www.bitcoin-italia.org/">Bitcoin Foundation Italia</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="netherlands"><img src="/img/flags/NL.png" alt="Dutch flag">Netherlands</h3>
<p>
@ -150,8 +150,6 @@ id: community
<a href="https://bitcoinembassy.nl/">Bitcoin Embassy Amsterdam</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="philippines"><img src="/img/flags/PH.png" alt="Philippine flag">Philippines</h3>
<p>
@ -164,14 +162,14 @@ id: community
<a href="http://www.bitcoin.org.pl/">Polish Bitcoin Association</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="romania"><img src="/img/flags/RO.png" alt="Romanian flag">Romania</h3>
<p>
<a href="http://fundatiabitcoin.ro/">Fundatia Bitcoin Romania</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="russia"><img src="/img/flags/RU.png" alt="Russian flag">Russia</h3>
<p>
@ -184,14 +182,14 @@ id: community
<a href="http://www.bitcoinua.org/">Bitcoin Foundation Ukraine</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="slovenia"><img src="/img/flags/SI.png" alt="Slovenian flag">Slovenia</h3>
<p>
<a href="http://bitcoin.si/">Bitcoin Društvo Slovenije</a>
</p>
</div>
</div>
<div>
<div>
<h3 id="sweden"><img src="/img/flags/SE.png" alt="Swedish flag">Sweden</h3>
<p>

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>