Alejandro Tasistro 0b55fa8109 Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total ... # Conflicts: # resources/js/components/pedidos/Chismosa.vue # resources/js/components/pedidos/ChismosaDropdown.vue # resources/views/productos.blade.php		2024-10-08 19:43:04 -03:00
..
CartelPedidoAprobado.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
CategoriasContainer.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
Chismosa.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
ChismosaDropdown.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
DevolucionesModal.vue	Refactor de componentes de pantalla de pedidos	2024-08-30 01:34:03 -03:00
Login.vue	Refactor de componentes de pantalla de pedidos	2024-08-30 01:34:03 -03:00
NavMigas.vue	Refactor de componentes de pantalla de pedidos	2024-08-30 01:34:03 -03:00
ProductoCard.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
ProductoRow.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
ProductosContainer.vue	Merge branch 'refs/heads/master' into funcion/planilla-pedidos-total	2024-10-08 19:43:04 -03:00
SubpedidoSelect.vue	Refactor de componentes de pantalla de pedidos	2024-08-30 01:34:03 -03:00