softsimon
9d75c47792
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