Commit e830edb5 authored by Gamaliel 'Yel' Padillo's avatar Gamaliel 'Yel' Padillo Committed by GitHub

Merge pull request #2042 from kvhnuke/devop/sync-repo

devop/sync-repo
parents 1344135c 9cf4275d
### New
- Update darklist from eth-list, update ledger affiliate links [#2042](https://github.com/kvhnuke/etherwallet/pull/2042)
- Add USD//Coin (USDC) token [#2036](https://github.com/kvhnuke/etherwallet/pull/2036)
- Add LCT token [#2035](https://github.com/kvhnuke/etherwallet/pull/2035)
- BUG FIX: Fix missing break after bad merge conflict resolution [#2034](https://github.com/kvhnuke/etherwallet/pull/2034)
......
......@@ -54,7 +54,7 @@
</div>
<p> Buy a... </p>
<div class="footer__pill-wrap footer__pill-custom-wrap">
<a class="footer__pill" href="https://www.ledgerwallet.com/r/fa4b?path=/products/" target="_blank" rel="noopener">Ledger Wallet</a>
<a class="footer__pill" href="https://www.ledger.com/products/ledger-nano-s?r=fa4b" target="_blank" rel="noopener">Ledger Wallet</a>
<a class="footer__pill" href="https://trezor.io/?a=myetherwallet.com" target="_blank" rel="noopener">TREZOR</a>
<a class="footer__pill" href="http://shiftcrypto.ositracker.com/91316/7114" target="_blank" rel="noopener">Digital Bitbox</a>
<a class="footer__pill" href="https://ether.cards/?utm_source=mew&utm_medium=cpm&utm_campaign=site" target="_blank" rel="noopener">ether.card</a>
......
This diff is collapsed.
......@@ -282,7 +282,7 @@
</a>
</li>
<li class="u__protip">
<a href="https://www.ledgerwallet.com/r/fa4b?path=/products/"
<a href="https://www.ledger.com/products/ledger-nano-s?r=fa4b"
target="_blank"
rel="noopener noreferrer">
Don't have a Ledger? Get one today.
......@@ -1058,8 +1058,8 @@
</p>
</label>
</div>
<div class="col-sm-4">
<label class="radio small">
<p class="small"><strong>
......
......@@ -66,7 +66,7 @@
"type": "default"
},
{
"address": "0xBDe8f7820b5544a49D34F9dDeaCAbEDC7C0B5adc",
"address": "0xBa7DCBa2Ade319Bc772DB4df75A76BA00dFb31b0",
"symbol": "A18",
"decimal": 0,
"type": "default"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment