William Buezas 4c84fd9326 resolve conflicts		2024-06-07 09:03:41 -03:00
..
assets	refs #6067 feat: outLayout verifyEmail	2023-10-02 14:54:00 +02:00
boot	fix: src/components/EditPictureForm.vue	2024-05-31 13:33:03 +02:00
components	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-07 12:03:41 +02:00
composables	Merge branch 'dev' into 6905-fixUserPanelLocal	2024-06-07 09:47:48 +00:00
css	Merge branch 'dev' into feature/AccountRoles	2024-06-06 07:32:15 +00:00
filters	fix: dashOrCurrency filter	2024-05-29 12:17:45 +02:00
i18n	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
layouts	feat(light theme): refs #7001 add light theme	2024-03-19 11:15:54 +01:00
pages	resolve conflicts	2024-06-07 09:03:41 -03:00
router	resolve conflicts	2024-06-07 09:03:41 -03:00
stores	Merge branch 'dev' into feature/ZoneCalendar	2024-06-07 09:32:51 +02: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