Claire 5fbe5fed1e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
flavours	[Glitch] Remove hardcoded width from dropdown overlays	2023-01-12 17:48:10 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00