Jeremy Kescher 1c9291adcd Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/styles/components/accounts.scss # app/javascript/flavours/glitch/styles/components/status.scss		2024-02-14 18:02:38 +01:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
core	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
flavours	Merge branch 'glitch-soc' into develop	2024-02-14 18:02:38 +01:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks
icons
images	Port three new emoji reaction PR commits to Catstodon:	2024-01-28 02:22:43 +01:00
mastodon	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
material-icons	Merge branch 'glitch-soc' into develop	2024-02-06 22:58:23 +01:00
packs	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
skins
styles	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +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