fastforward problem

Browse Source

Merge branch 'mod/presupuesto_admin' of https://git.imnavajas.es/jjimenez/safekat into mod/presupuesto_admin

...

This commit is contained in:

Jaime Jiménez

2025-01-19 19:46:09 +01:00

parent d458498fad 9b0604bed6

commit fee6e3b674

23 changed files with 412 additions and 395 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

ci4/app/Entities/Configuracion/TareaMaquinaEntity.php → ci4/app/Entities/Tarifas/Maquinas/TareaMaquinaEntity.php