Merge branch 'development' into 'img'
# Conflicts: # pinsisApp/src/app/events/events.component.scss
Showing
- pinsisApp/src/app/_services/marker.service.ts 19 additions, 16 deletionspinsisApp/src/app/_services/marker.service.ts
- pinsisApp/src/app/_services/pop-up.service.ts 2 additions, 2 deletionspinsisApp/src/app/_services/pop-up.service.ts
- pinsisApp/src/app/about/about.component.ts 16 additions, 16 deletionspinsisApp/src/app/about/about.component.ts
- pinsisApp/src/app/app-routing.module.ts 16 additions, 16 deletionspinsisApp/src/app/app-routing.module.ts
- pinsisApp/src/app/app.component.ts 13 additions, 13 deletionspinsisApp/src/app/app.component.ts
- pinsisApp/src/app/app.module.ts 13 additions, 13 deletionspinsisApp/src/app/app.module.ts
- pinsisApp/src/app/data-api.service.ts 13 additions, 20 deletionspinsisApp/src/app/data-api.service.ts
- pinsisApp/src/app/edit-machine/edit-machine.component.html 1 addition, 1 deletionpinsisApp/src/app/edit-machine/edit-machine.component.html
- pinsisApp/src/app/edit-machine/edit-machine.component.scss 15 additions, 15 deletionspinsisApp/src/app/edit-machine/edit-machine.component.scss
- pinsisApp/src/app/edit-machine/edit-machine.component.ts 1 addition, 17 deletionspinsisApp/src/app/edit-machine/edit-machine.component.ts
- pinsisApp/src/app/events/events.component.scss 5 additions, 4 deletionspinsisApp/src/app/events/events.component.scss
- pinsisApp/src/app/footer/footer-element.ts 13 additions, 13 deletionspinsisApp/src/app/footer/footer-element.ts
- pinsisApp/src/app/footer/footer.component.scss 2 additions, 13 deletionspinsisApp/src/app/footer/footer.component.scss
- pinsisApp/src/app/footer/footer.component.ts 16 additions, 16 deletionspinsisApp/src/app/footer/footer.component.ts
- pinsisApp/src/app/footer/mock-footer-elements.ts 13 additions, 13 deletionspinsisApp/src/app/footer/mock-footer-elements.ts
- pinsisApp/src/app/graphs-page/graph-element/graph-element.component.ts 14 additions, 14 deletions.../app/graphs-page/graph-element/graph-element.component.ts
- pinsisApp/src/app/header/header.component.scss 0 additions, 11 deletionspinsisApp/src/app/header/header.component.scss
- pinsisApp/src/app/header/header.component.ts 16 additions, 16 deletionspinsisApp/src/app/header/header.component.ts
- pinsisApp/src/app/hospital-selector/hospital-selector.component.scss 2 additions, 1 deletion...rc/app/hospital-selector/hospital-selector.component.scss
- pinsisApp/src/app/hospital-selector/hospital-selector.component.ts 13 additions, 14 deletions.../src/app/hospital-selector/hospital-selector.component.ts
Loading
Please register or sign in to comment