Merge branch 'dev' into 'feat/admin-structure-delete'
# Conflicts: # src/app/structure-list/components/search/search.component.ts
No related branches found
No related tags found
Showing
- package-lock.json 0 additions, 22 deletionspackage-lock.json
- package.json 1 addition, 1 deletionpackage.json
- src/app/home/home.component.html 5 additions, 0 deletionssrc/app/home/home.component.html
- src/app/home/home.component.ts 14 additions, 0 deletionssrc/app/home/home.component.ts
- src/app/map/components/map.component.html 0 additions, 1 deletionsrc/app/map/components/map.component.html
- src/app/map/components/map.component.ts 25 additions, 14 deletionssrc/app/map/components/map.component.ts
- src/app/map/map.module.ts 1 addition, 2 deletionssrc/app/map/map.module.ts
- src/app/structure-list/components/search/search.component.ts 17 additions, 2 deletionssrc/app/structure-list/components/search/search.component.ts
- src/app/structure-list/structure-list.component.html 6 additions, 1 deletionsrc/app/structure-list/structure-list.component.html
- src/app/structure-list/structure-list.component.ts 11 additions, 0 deletionssrc/app/structure-list/structure-list.component.ts
Loading
Please register or sign in to comment