Claire c2f0ea415e Merge commit '899eac1a92' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.		2024-02-28 20:10:01 +01:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
core	Merge commit '899eac1a92' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
flavours	Merge commit '899eac1a92' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks
icons
images	Merge commit '6936e5aa69' into glitch-soc/merge-upstream-composer	2024-02-22 20:58:41 +01:00
mastodon	Merge commit '899eac1a92' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
material-icons	[Glitch] Fix pixel alignment for some composer icons	2024-02-24 15:53:42 +01:00
packs	Merge commit '899eac1a92' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
skins
styles	Merge commit '6f7615ba86' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01: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