Claire d5b959a2ca Merge commit '75fca715e9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some preferences to a new category, while glitch-soc had an extra preference there. Moved the extra preference like upstream did to the new category.		2025-09-02 19:07:51 +02:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
entrypoints	Convert from Webpack to Vite (#34450)	2025-05-16 13:26:12 +00:00
flavours	New Crowdin Translations (automated) (#3103)	2025-08-31 16:16:20 +02:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
icons
images	Merge commit 'ac59772dc6' into glitch-soc/merge-upstream	2025-08-06 22:02:55 +02:00
mastodon	Merge commit '75fca715e9' into glitch-soc/merge-upstream	2025-09-02 19:07:51 +02:00
material-icons	Merge commit '75fca715e9' into glitch-soc/merge-upstream	2025-09-02 19:07:51 +02:00
skins	Merge commit '825312d4b0' into glitch-soc/merge-upstream	2025-06-12 20:32:25 +02:00
styles	Merge commit '75fca715e9' into glitch-soc/merge-upstream	2025-09-02 19:07:51 +02:00
svg-icons	Change design of lists in web UI (#32881)	2024-11-21 16:10:04 +00:00
testing	Add quotes_count to statuses stats (#35832)	2025-08-25 12:21:28 +00:00
types	Convert from Webpack to Vite (#34450)	2025-05-16 13:26:12 +00:00