Merge remote-tracking branch 'origin/funcion/arreglar-planilla-totales' into funcion/arreglar-planilla-totales
# Conflicts: # app/Producto.php
This commit is contained in:
commit
acc21091f9
# Conflicts: # app/Producto.php