Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' 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__	…
flavours	[Glitch] Fix incorrect label for filtered notifications badge	2024-05-01 19:18:06 +02:00
fonts	…
hooks	…
icons	…
images	…
mastodon	Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
material-icons	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
packs	Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' 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 '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
svg-icons	…
types	…