Claire 2810231180 Merge commit 'b2388be71e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.		2024-05-16 19:30:10 +02:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
entrypoints	Merge commit 'b7902225d6' into glitch-soc/merge-upstream	2024-05-04 16:28:30 +02:00
flavours	[Glitch] Fix missing prop warning for <Account>	2024-05-14 20:53:40 +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 'b2388be71e' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
material-icons	Merge commit '7201f99cf8' 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 'b2388be71e' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +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