William Buezas 4925bed845 resolve conflicts		2024-03-13 11:31:55 -03:00
..
assets	refs #6067 feat: outLayout verifyEmail	2023-10-02 14:54:00 +02:00
boot	refs #6062 fix: migration errors	2023-12-13 14:19:42 +01:00
components	resolve conflicts	2024-03-13 11:31:55 -03:00
composables	resolve conflicts	2024-03-13 11:31:55 -03:00
css	resolve conflicts	2024-03-13 11:31:55 -03:00
filters	resolve conflicts	2024-03-13 11:31:55 -03:00
i18n	resolve conflicts	2024-03-13 11:31:55 -03:00
layouts	fix(toolbar): refs #6486 add colors	2024-03-06 09:22:32 +01:00
pages	resolve conflicts	2024-03-13 11:31:55 -03:00
router	resolve conflicts	2024-03-13 11:31:55 -03:00
stores	Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154	2024-02-07 22:38:57 -03:00
App.vue	refs #6383 set dark	2024-01-09 14:37:44 +01:00