Merge branch 'dev' into 'feat/add-brignais-to-carto'
# Conflicts: # src/app/map/components/map.component.ts
No related branches found
No related tags found
Showing
- src/app/form/form.component.html 2 additions, 1 deletionsrc/app/form/form.component.html
- src/app/form/form.component.ts 4 additions, 4 deletionssrc/app/form/form.component.ts
- src/app/home/home.component.ts 6 additions, 6 deletionssrc/app/home/home.component.ts
- src/app/map/components/map.component.ts 5 additions, 16 deletionssrc/app/map/components/map.component.ts
- src/app/map/services/map.service.ts 7 additions, 7 deletionssrc/app/map/services/map.service.ts
- src/app/models/structure.model.ts 13 additions, 2 deletionssrc/app/models/structure.model.ts
- src/app/models/user.model.ts 2 additions, 2 deletionssrc/app/models/user.model.ts
- src/app/profile/services/profile.service.ts 2 additions, 2 deletionssrc/app/profile/services/profile.service.ts
- src/app/services/structure.service.ts 5 additions, 4 deletionssrc/app/services/structure.service.ts
- src/app/structure-list/components/card/card.component.html 1 addition, 1 deletionsrc/app/structure-list/components/card/card.component.html
- src/app/structure-list/components/card/card.component.ts 0 additions, 10 deletionssrc/app/structure-list/components/card/card.component.ts
- src/app/structure-list/components/structure-details/structure-details.component.html 11 additions, 5 deletions...onents/structure-details/structure-details.component.html
- src/app/structure-list/components/structure-details/structure-details.component.ts 1 addition, 11 deletions...mponents/structure-details/structure-details.component.ts
- src/app/structure-list/structure-list.component.ts 6 additions, 7 deletionssrc/app/structure-list/structure-list.component.ts
Loading
Please register or sign in to comment