Jaime Jimenez Ortega 4d7accc33f Merge branch 'main' into 'dev/calculo_impresion_horas' ...

# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js

2024-01-03 15:59:23 +00:00

..

errors

listo para añadir tarifas

2023-11-23 22:20:38 +01:00

themes

Merge branch 'main' into 'dev/calculo_impresion_horas'

2024-01-03 15:59:23 +00:00