Javier Segarra 8bb3d48c81 Merge branch 'dev' into feature/FixedPrices		2024-04-24 07:37:39 +00:00
..
fonts	resolve conflicts	2024-03-13 11:31:55 -03:00
app.scss	Merge branch 'dev' into feature/FixedPrices	2024-04-24 07:37:39 +00:00
icons.scss	resolve conflicts	2024-03-13 11:31:55 -03:00
quasar.variables.scss	minor changes	2024-04-05 09:12:49 +02:00