Claire 1716f8da71 Merge commit '3b52dca405' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream added a `features` attribute where glitch-soc had extra ones. Added `features` like upstream did.		2025-07-11 18:53:47 +02:00
..
__mocks__
entrypoints	Convert from Webpack to Vite (#34450)	2025-05-16 13:26:12 +00:00
flavours	[Glitch] Fix replying from media modal or pop-in-player tagging user @undefined	2025-07-10 01:22:14 +02:00
fonts
icons
images	Merge commit '7a70d95435' into glitch-soc/merge-upstream	2025-04-25 17:22:10 +02:00
mastodon	Merge commit '3b52dca405' into glitch-soc/merge-upstream	2025-07-11 18:53:47 +02:00
material-icons	Merge commit '69f298731e' into glitch-soc/merge-upstream	2025-06-16 21:07:55 +02:00
skins	Merge commit '825312d4b0' into glitch-soc/merge-upstream	2025-06-12 20:32:25 +02:00
styles	Merge commit '8ee6cee36e' into glitch-soc/merge-upstream	2025-07-08 16:41:01 +02:00
svg-icons	Change design of lists in web UI (#32881)	2024-11-21 16:10:04 +00:00
testing	Storybook Helpers (#35158)	2025-06-25 11:20:11 +00:00
types	Convert from Webpack to Vite (#34450)	2025-05-16 13:26:12 +00:00