Merge branch 'master' into simon/configurable-main-module
# Conflicts: # frontend/src/app/components/blockchain/blockchain.component.ts
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user