pinsisApp/src/app/edit-machine/edit-machine.component.scss · 83b6336b9803e74ca6af4ce48346f824c2b6e6d9 · pinsis-dev / pinsis-portal · GitLab

Snippets Groups Projects

5 years ago
f9296f86
Merge branch 'development' into '87-buscas-dos-equipamentos-cadastrados-por-leitura-do-qr-code' · f9296f86
Bruna Cruz authored 5 years ago
```
# Conflicts:
#   pinsisApp/src/app/events/events.component.html
```
f9296f86

History
Merge branch 'development' into '87-buscas-dos-equipamentos-cadastrados-por-leitura-do-qr-code'
Bruna Cruz authored 5 years ago
```
# Conflicts:
#   pinsisApp/src/app/events/events.component.html
```