Carlos Satorres 022fd6caa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData		2024-04-26 09:17:23 +02:00
..
assets	refs #6067 feat: outLayout verifyEmail	2023-10-02 14:54:00 +02:00
boot	fix: refs #6425 fixed dev translations	2024-04-16 11:00:38 +02:00
components	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel	2024-04-26 08:36:15 +02:00
composables	refs: #6764 fixConflicts	2024-04-25 08:50:12 +02:00
css	refs: #6764 fixConflicts	2024-04-25 08:50:12 +02:00
filters	refs: #6764 fixConflicts	2024-04-25 08:50:12 +02:00
i18n	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
layouts	Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard"	2024-04-11 09:01:44 +02:00
pages	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-26 09:17:23 +02:00
router	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
stores	resolve conflicts	2024-04-16 10:11:03 -03:00
utils	Create route tickets actions	2024-02-19 09:58:28 -03:00
App.vue	refs #7147 add value	2024-03-27 13:36:51 +01:00