Claire 6204d13a2e Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.		2024-05-01 19:38:34 +02:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
flavours	[Glitch] Fix incorrect label for filtered notifications badge	2024-05-01 19:18:06 +02:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks
icons
images	Merge commit 'ffc5be4820' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
mastodon	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
material-icons	Merge commit '119c7aa0df' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
packs	Merge commit '4045c069f8' into glitch-soc/merge-upstream	2024-05-01 17:26:21 +02:00
skins	Rename app/javascript/flavours/glitch/styles/index.scss to application.scss	2024-04-30 21:03:04 +02:00
styles	Merge commit '0622107449' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
svg-icons	Use active variants for boost icons and increase icon size (#27924)	2024-01-24 12:37:43 +00:00
types	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00