Merge branch 'development' into '107-responsividade-na-pagina-de-edicao-de-equipamentos'
# Conflicts: # pinsisApp/src/app/events/events.component.scss
No related tags found
Showing
- pinsisApp/src/app/edit-machine/edit-machine.component.ts 0 additions, 1 deletionpinsisApp/src/app/edit-machine/edit-machine.component.ts
- pinsisApp/src/app/events/events.component.html 1 addition, 1 deletionpinsisApp/src/app/events/events.component.html
- pinsisApp/src/app/events/events.component.scss 8 additions, 0 deletionspinsisApp/src/app/events/events.component.scss
- pinsisApp/src/app/maps-page/maps-page.component.ts 1 addition, 1 deletionpinsisApp/src/app/maps-page/maps-page.component.ts
- pinsisApp/src/app/register-equipment/register-equipment.component.ts 22 additions, 5 deletions...rc/app/register-equipment/register-equipment.component.ts
Loading
Please register or sign in to comment