Ignacio Martinez Navajas 4510c86122 Merge branch 'main' into 'dev/core_updates_3' ...

# Conflicts:
#   ci4/app/Views/themes/vuexy/main/menu_impresion.php

2024-05-10 12:24:49 +00:00

..

activity

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

clientes

Merge branch 'main' into 'dev/presupuesto_cliente_2'

2024-05-08 18:45:04 +00:00

compras/proveedores

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

configuracion

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

group

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

my

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

presupuestos

finalizado a espera de pruebas

2024-05-10 12:35:47 +02:00

profile

Arreglando profile y pequeños bugs

2024-05-08 23:42:54 +02:00

settings

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

tarifas

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

test_js

intentando resolver conflictos

2024-05-08 20:44:40 +02:00

user

intentando resolver conflictos

2024-05-08 20:44:40 +02:00