Claire ef3d15554b Merge commit 'c645490d55' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +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	[Glitch] Fix report reason selector in moderation interface not unselecting rules when changing category	2024-02-24 14:36:55 +01:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge commit '6936e5aa69' into glitch-soc/merge-upstream-composer	2024-02-22 20:58:41 +01:00
mastodon	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
material-icons	Merge commit 'aaa58d4807' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
packs	Merge commit '6936e5aa69' into glitch-soc/merge-upstream-composer	2024-02-22 20:58:41 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +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