Robert Ferrús 34df4aed54 feat: refs #8077 resolve conflict		2024-10-24 08:04:55 +02:00
..
back	feat: refs #8077 resolve conflict	2024-10-24 08:04:55 +02:00
front	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-04 13:46:41 +02:00