William Buezas 3a03e42cf9 Resolve conflicts		2024-04-19 10:40:04 -03:00
..
fonts	resolve conflicts	2024-03-13 11:31:55 -03:00
app.scss	Resolve conflicts	2024-04-19 10:40:04 -03: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