Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-11 09:37:48 +02:00
..
core	…
flavours	…
fonts	…
images	…
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
packs	…
skins	…
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00