Vista inventario
Merge origin/master