Merge branch 'development' into '53-criar-pagina-editavel-aceleracao-dos-visualizadores'
# Conflicts: # pinsisApp/src/app/events/events.component.ts
No related branches found
No related tags found
Showing
- pinsisApp/src/app/app.module.ts 2 additions, 2 deletionspinsisApp/src/app/app.module.ts
- pinsisApp/src/app/events/events.component.html 14 additions, 6 deletionspinsisApp/src/app/events/events.component.html
- pinsisApp/src/app/events/events.component.ts 35 additions, 8 deletionspinsisApp/src/app/events/events.component.ts
- pinsisApp/src/app/machine.ts 14 additions, 0 deletionspinsisApp/src/app/machine.ts
- pinsisApp/src/app/machines.service.spec.ts 15 additions, 0 deletionspinsisApp/src/app/machines.service.spec.ts
- pinsisApp/src/app/machines.service.ts 58 additions, 0 deletionspinsisApp/src/app/machines.service.ts
- pinsisApp/src/app/register-equipment/register-equipment.component.html 9 additions, 9 deletions.../app/register-equipment/register-equipment.component.html
- pinsisApp/src/app/register-equipment/register-equipment.component.ts 39 additions, 26 deletions...rc/app/register-equipment/register-equipment.component.ts
- server/routes/api.js 40 additions, 36 deletionsserver/routes/api.js
Loading
Please register or sign in to comment