1
0

Merge branch 'main' into w2p-72699_Hard-redirect-after-log-in

Conflicts:
	src/app/app-routing.module.ts
This commit is contained in:
Kristof De Langhe
2020-09-07 10:22:37 +02:00
35 changed files with 1476 additions and 11 deletions

View File

@@ -48,6 +48,7 @@ import { ReloadGuard } from './core/reload/reload.guard';
{ path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
{ path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
{ path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
{ path: 'import-external', loadChildren: './+import-external-page/import-external-page.module#ImportExternalPageModule' },
{
path: 'workspaceitems',
loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule'