Merge remote-tracking branch 'origin/main' into DSC-287-Show-an-error-page-if-the-REST-API-is-not-available

# Conflicts:
#	src/app/app-routing.module.ts
This commit is contained in:
Giuseppe Digilio
2021-12-15 15:00:47 +01:00
28 changed files with 100 additions and 39 deletions

View File

@@ -218,7 +218,6 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
}
], {
onSameUrlNavigation: 'reload',
relativeLinkResolution: 'legacy'
})
],
exports: [RouterModule],