Merge branch 'master' into simon/configurable-main-module

# Conflicts:
#	frontend/src/app/components/blockchain/blockchain.component.ts
This commit is contained in:
softsimon committed 2021-08-02 00:24:09 +03:00
commit 322b743cfa
48 files changed
+494 -386

No files matched your search

@@ -1,8 +1,8 @@
<div class="text-center" class="blockchain-wrapper">
<div class="position-container {{ network }}">
<span>
<app-mempool-blocks [isLoading$]="isLoading$"></app-mempool-blocks>
<app-blockchain-blocks [isLoading$]="isLoading$"></app-blockchain-blocks>
<app-mempool-blocks></app-mempool-blocks>
<app-blockchain-blocks></app-blockchain-blocks>
<div id="divider"></div>
</span>
</div>