pinsisApp/src/app/register-equipment/register-equipment.component.html · 4c508aa1b7f88c588ba663ab72e163c873d7d285 · pinsis-dev / pinsis-portal

5 years ago

Merge branch 'development' into '52-criar-put-no-front-end-para-atualizar-dados-do-equipamento' · d7b09c7b

Dante Aléo authored 5 years ago

# Conflicts:
#   pinsisApp/src/app/edit-machine/edit-machine.component.html
#   pinsisApp/src/app/edit-machine/edit-machine.component.ts
#   pinsisApp/src/app/machines.service.ts
#   pinsisApp/src/app/register-equipment/register-equipment.component.html
#   pinsisApp/src/app/register-equipment/register-equipment.component.ts

d7b09c7b

History

Merge branch 'development' into '52-criar-put-no-front-end-para-atualizar-dados-do-equipamento'

Dante Aléo authored 5 years ago

# Conflicts:
#   pinsisApp/src/app/edit-machine/edit-machine.component.html
#   pinsisApp/src/app/edit-machine/edit-machine.component.ts
#   pinsisApp/src/app/machines.service.ts
#   pinsisApp/src/app/register-equipment/register-equipment.component.html
#   pinsisApp/src/app/register-equipment/register-equipment.component.ts