Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore

1 files changed, 14 insertions, 0 deletions

diff --git a/sandbox/TestAppOgnjen/FrontEnd/src/app/app-routing.module.ts b/sandbox/TestAppOgnjen/FrontEnd/src/app/app-routing.module.ts
new file mode 100644
index 00000000..6aeec2fd
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/src/app/app-routing.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { ListaComponent } from './lista/lista.component';
+
+const routes: Routes = [
+  {path:'lista',component:ListaComponent}
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }