Claire 666760f450 Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.		2024-05-14 20:47:14 +02:00
..
__mocks__	…
entrypoints	Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream	2024-05-04 16:28:30 +02:00
flavours	[Glitch] Fix typo	2024-05-11 22:44:41 +02:00
fonts	…
hooks	…
icons	…
images	…
mastodon	Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream	2024-05-14 20:47:14 +02:00
material-icons	Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +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 '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream	2024-05-14 20:47:14 +02:00
svg-icons	…
types	…