Merge with master

This commit is contained in:
Igor Kuzmenko 2017-07-31 11:13:06 +02:00
parent 73f6c9ab29
commit c49e7187b5
81 changed files with 3577 additions and 3514 deletions

File diff suppressed because it is too large Load diff

View file

@ -29,6 +29,7 @@ id: resources
<p><a href="https://99bitcoins.com/who-accepts-bitcoins-payment-companies-stores-take-bitcoins/">{% translate linkmerchants %}</a> - 99Bitcoins.com</p>
<p><a href="https://www.buybitcoinworldwide.com/">{% translate linkexchanges %}</a> - buybitcoinworldwide.com</p>
<p><a href="https://en.bitcoin.it/wiki/Category:Shopping_Cart_Interfaces">{% translate linkmerchantstools %}</a> - en.bitcoin.it</p>
<p><a href="http://www.bitcoinprojects.net/">{% translate linkprojects %}</a> - BitcoinProjects.net</p>
</div>
</div>
<div>