merged code from main branch, fixed merged conflict

This commit is contained in:
Calvin Jhunjhnuwala
2020-08-31 14:05:10 -07:00
14 changed files with 2722 additions and 272 deletions

View File

@@ -41,10 +41,10 @@
<div class="col-md-6 offset-md-1 order-2 order-md-1">
<h2 class="mb-10">{% trans %}Cross-Border Payments{% endtrans %}</h2>
<p class="mb-10 normal">{% trans %}Through RippleNet, financial institutions can use XRP to bridge two currencies in 3-5 seconds, ensuring payments are quickly sent and received in the local currency on either side of a transaction.{% endtrans %}</p>
<a href="#" class="btn btn-clear">{% trans %}Learn About On-Demand Liquidity{% endtrans %}</a>
<a href="https://ripple.com/ripplenet/on-demand-liquidity" class="btn btn-clear">{% trans %}Learn About On-Demand Liquidity{% endtrans %}</a>
</div>
</section>
<section class="row mb-50">
<h6 class="section-marker">{% trans %}Micropayments{% endtrans %}</h6>
<div class="col-md-4 offset-md-1 mb-10 text-center">
@@ -53,7 +53,7 @@
<div class="col-md-6 offset-md-1">
<h2 class="mb-10">{% trans %}Micropayments{% endtrans %}</h2>
<p class="mb-10 normal">{% trans %}Businesses are leveraging XRP and the XRP Ledger to build innovative products for gaming, content and web monetization, among other applications where money is at the center.{% endtrans %}</p>
<a href="#" class="btn btn-clear">{% trans %}Learn About XRPL Businesses{% endtrans %}</a>
<a href="businesses.html" class="btn btn-clear">{% trans %}Learn About XRPL Businesses{% endtrans %}</a>
</div>
</section>
@@ -65,10 +65,10 @@
<div class="col-md-6 offset-md-1 order-2 order-md-1">
<h2 class="mb-10">{% trans %}Digital Cryptocurrency Wallets{% endtrans %}</h2>
<p class="mb-10 normal">{% trans %}Individuals can use mobile wallets to store private and public passwords and interact with various blockchains to send and receive digital assets, including XRP.{% endtrans %}</p>
<a href="#" class="btn btn-clear">{% trans %}Explore Wallets{% endtrans %}</a>
<a href="wallets.html" class="btn btn-clear">{% trans %}Explore Wallets{% endtrans %}</a>
</div>
</section>
<section class="row mb-50">
<h6 class="section-marker">{% trans %}Exchanges{% endtrans %}</h6>
<div class="col-md-4 offset-md-1 mb-10 text-center">
@@ -77,7 +77,7 @@
<div class="col-md-4 offset-md-1">
<h2 class="mb-10">{% trans %}Exchanges{% endtrans %}</h2>
<p class="mb-10 normal">{% trans %}Market makers and individuals use exchanges to trade XRP and other digital assets. Exchanges are often also intermediaries in cross-border payments among financial institutions.{% endtrans %}</p>
<a href="#" class="btn btn-clear">{% trans %}Explore Exchanges{% endtrans %}</a>
<a href="exchanges.html" class="btn btn-clear">{% trans %}Explore Exchanges{% endtrans %}</a>
</div>
</section>