Claire 2aac73341a Merge commit '80d9bff6df' into glitch-soc/merge-upstream ... Conflicts: - `app/services/backup_service.rb`: Conflict due to glitch-soc's local-only posts. Ported upstream's changes while keeping glitch-soc's feature.		2024-07-22 17:38:30 +02:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
entrypoints	Merge commit 'd20a5c3ec9' into glitch-soc/merge-upstream	2024-05-29 17:03:24 +02:00
flavours	[Glitch] Remove routerHistory parameters from composer actions	2024-07-19 18:06:35 +02:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks	Change hover cards to not appear until the mouse stops in web UI (#30850)	2024-07-01 15:52:01 +00:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge commit 'ffc5be4820' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
mastodon	Merge commit '80d9bff6df' into glitch-soc/merge-upstream	2024-07-22 17:38:30 +02:00
material-icons	Merge commit '7201f99cf8' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
skins	Rename app/javascript/flavours/glitch/styles/index.scss to application.scss	2024-04-30 21:03:04 +02:00
styles	Merge commit '0397df9bef' into glitch-soc/merge-upstream	2024-07-19 17:45:19 +02: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