Merge remote-tracking branch 'remotes/luke-jr/master' into master

This commit is contained in:
Saivann 2014-10-03 15:36:09 -04:00
commit 89b86f6b66
12 changed files with 394 additions and 75 deletions

View file

@ -33,7 +33,7 @@ id: resources
<p>{% translate linkcointelegraph %}<p>
<p><a href="http://www.coindesk.com/">CoinDesk</a></p>
<p><a href="http://bitcoinmagazine.com/">Bitcoin Magazine</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">Bitcoin Forum / Press</a></p>{% endif %}
{% 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 %}
</div><div>
<h2><img src="/img/ico_market.svg" class="titleicon" alt="Icon">{% translate charts %}</h2>
<p><a href="http://blockchain.info/charts">Blockchain.info</a></p>