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

@@ -48,7 +48,7 @@
<div class="timeline-dot"></div>
<div class="timeline-content">
<h4 class="mb-10">{% trans %}2012 XRP Launched{% endtrans %}</h4>
<p>{% trans %}In 2011 and early 2012, the trio of developers started a project to build a distributed ledger that improved upon these fundamental limitations of Bitcoin—their first ever code commit was in November 2011.{% endtrans %}</p>
<p>{% trans %}In 2011 and early 2012, the trio of developers started a project to build a distributed ledger that improved upon these fundamental limitations of Bitcoin—their first ever code commit was in November 2011.{% endtrans %}</p>
<p>{% trans %}They wrote code, that when executed, would create a distributed ledger, which they named Ripple. It included a digital asset that would be called “ripples” (XRP as the currency code) to follow the same naming convention as bitcoin (BTC). At the time, Ripple stood for the open-source project, the unique consensus ledger (Ripple Consensus Ledger), transaction protocol (Ripple Transaction Protocol or RTXP), the network (Ripple network) and the digital asset (known as “ripples”).{% endtrans %}</p>
<p>{% trans %}In practice, this approach led to many, broad uses of “Ripple.” To clarify, the community simply started calling the digital asset, “XRP.”{% endtrans %}</p>
<p>{% trans %}By June 2012, Schwartz, McCaleb and Britto completed code development and the XRP Ledger was fully functioning.{% endtrans %}</p>
@@ -79,7 +79,7 @@
<div class="col-sm-5 offset-sm-1 order-2 order-sm-1 mt-20">
<h2 class="mb-10">{% trans %}How Digital Assets Will Help Create a Sustainable Global Economy{% endtrans %}</h2>
<p class="mb-10">{% trans %}Hear from Ripple co-founder Chris Larsen in the inaugural episode of the Block Stars podcast.{% endtrans %}</p>
<a href="#" class="btn btn-clear">{% trans %}Listen Now{% endtrans %}</a>
<a href="https://ripple.com/podcast" class="btn btn-clear">{% trans %}Listen Now{% endtrans %}</a>
</div>
</section>
</div>