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

# Conflicts:
#	frontend/src/app/components/api-docs/api-docs.component.ts
#	frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
#	frontend/src/app/components/master-page/master-page.component.html
#	frontend/src/app/components/mempool-blocks/mempool-blocks.component.html
#	frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
#	frontend/src/app/dashboard/dashboard.component.html
This commit is contained in:
softsimon
2021-08-13 17:16:14 +03:00
56 changed files with 1307 additions and 466 deletions

View File

@@ -91,5 +91,7 @@ pre {
padding: 30px;
code{
background-color: transparent;
white-space: break-spaces;
word-break: break-all;
}
}