Jaime Jimenez Ortega e04c978c38 Merge branch 'main' into 'dev/presupuesto_cliente_2' ...

Main

See merge request jjimenez/safekat!240

2024-05-08 18:45:04 +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

Merge branch 'main' into 'dev/presupuesto_cliente_2'

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

profile

intentando resolver conflictos

2024-05-08 20:44:40 +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