Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -17,7 +17,7 @@ export const routes: Routes = [
|
||||
|
||||
{
|
||||
path:'messages',
|
||||
loadComponent: () => import('./pages/messages/messages-menu/messages-menu.component').then(x => x.MessagesMenu)
|
||||
loadComponent: () => import('./pages/messages/messages-main/messages-main.component').then(x => x.MessagesMain)
|
||||
},
|
||||
{
|
||||
path:'menu',
|
||||
@@ -29,5 +29,9 @@ export const routes: Routes = [
|
||||
loadComponent: () => import('./pages/parameters/parameters.component').then(x => x.Parameters)
|
||||
}*/
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
path:'login',
|
||||
loadComponent: () => import('./pages/login-form/login-form.component').then(x => x.LoginFormComponent)
|
||||
},
|
||||
];
|
||||
Reference in New Issue
Block a user