Files
safekat/ci4/app/Controllers/Clientes
Ignacio Martinez Navajas c8efa48f5f Merge branch 'main' into 'dev/delete-ui'
# Conflicts:
#   ci4/app/Controllers/Tarifas/Tarifaacabado.php
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
2023-07-24 12:59:19 +00:00
..
2023-05-16 13:05:33 +02:00