Merge remote-tracking branch 'origin/funcion/arreglar-planilla-totales' into funcion/arreglar-planilla-totales

Browse Source

# Conflicts:
#	app/Producto.php

...

This commit is contained in:

Alejandro Tasistro 2024-12-09 07:20:56 -03:00

parent ec10bdca92 6dae6afe95

commit acc21091f9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available