ale 449579a768 Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total ... # Conflicts: # app/GrupoDeCompra.php		2024-09-01 13:11:53 -03:00
..
factories
migrations	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-09-01 13:11:53 -03:00
seeds	canasta 104 arreglo	2024-08-06 22:57:12 -03:00
.gitignore