Carlos Andrés dc897854a4 merge: refs #6802 merge dev fix conflicts		2024-07-11 13:59:55 +02:00
..
back	merge: refs #6802 merge dev fix conflicts	2024-07-11 13:59:55 +02:00
front	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-25 16:26:13 +02:00