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
2021-12-15 15:00:47 +01:00
parent d426f5f179 4ace07156f
commit 8f4379f3b4
28 changed files with 100 additions and 39 deletions
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -218,7 +218,6 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
      }
    ], {
      onSameUrlNavigation: 'reload',
-    relativeLinkResolution: 'legacy'
 })
  ],
  exports: [RouterModule],